From c0e7b3de4fadf69eb57557ff1b401ff9f005e1f0 Mon Sep 17 00:00:00 2001 From: abhishek Date: Wed, 11 Aug 2010 10:26:05 -0700 Subject: [PATCH 1/9] Test commit by Abhishek --- server/src/com/cloud/api/commands/AddConfigCmd.java | 1 + 1 file changed, 1 insertion(+) diff --git a/server/src/com/cloud/api/commands/AddConfigCmd.java b/server/src/com/cloud/api/commands/AddConfigCmd.java index 00ce03536ae..0ef2194f64e 100644 --- a/server/src/com/cloud/api/commands/AddConfigCmd.java +++ b/server/src/com/cloud/api/commands/AddConfigCmd.java @@ -78,6 +78,7 @@ public class AddConfigCmd extends BaseCmd { catch (Exception ex) { s_logger.error("Exception adding config value: ", ex); throw new ServerApiException(BaseCmd.INTERNAL_ERROR, "Failed to add config value : " + ex.getMessage()); + //test } } From 698eff4776c8ae2cdb2ca75d2ebf9c82807457e8 Mon Sep 17 00:00:00 2001 From: abhishek Date: Wed, 11 Aug 2010 10:39:05 -0700 Subject: [PATCH 2/9] Another test commit, to remove the previous comment i checked in --- server/src/com/cloud/api/commands/AddConfigCmd.java | 1 - 1 file changed, 1 deletion(-) diff --git a/server/src/com/cloud/api/commands/AddConfigCmd.java b/server/src/com/cloud/api/commands/AddConfigCmd.java index 0ef2194f64e..00ce03536ae 100644 --- a/server/src/com/cloud/api/commands/AddConfigCmd.java +++ b/server/src/com/cloud/api/commands/AddConfigCmd.java @@ -78,7 +78,6 @@ public class AddConfigCmd extends BaseCmd { catch (Exception ex) { s_logger.error("Exception adding config value: ", ex); throw new ServerApiException(BaseCmd.INTERNAL_ERROR, "Failed to add config value : " + ex.getMessage()); - //test } } From 1ac797382aa17ce1b3d34c6d01bf225c227630fb Mon Sep 17 00:00:00 2001 From: abhishek Date: Wed, 11 Aug 2010 10:49:05 -0700 Subject: [PATCH 3/9] test --- server/src/com/cloud/api/commands/AddConfigCmd.java | 1 + 1 file changed, 1 insertion(+) diff --git a/server/src/com/cloud/api/commands/AddConfigCmd.java b/server/src/com/cloud/api/commands/AddConfigCmd.java index 00ce03536ae..0ef2194f64e 100644 --- a/server/src/com/cloud/api/commands/AddConfigCmd.java +++ b/server/src/com/cloud/api/commands/AddConfigCmd.java @@ -78,6 +78,7 @@ public class AddConfigCmd extends BaseCmd { catch (Exception ex) { s_logger.error("Exception adding config value: ", ex); throw new ServerApiException(BaseCmd.INTERNAL_ERROR, "Failed to add config value : " + ex.getMessage()); + //test } } From 1493aadfcf887379596dc7fac888d225e3912dc1 Mon Sep 17 00:00:00 2001 From: abhishek Date: Wed, 11 Aug 2010 10:55:46 -0700 Subject: [PATCH 4/9] test --- server/src/com/cloud/api/commands/AddConfigCmd.java | 1 - 1 file changed, 1 deletion(-) diff --git a/server/src/com/cloud/api/commands/AddConfigCmd.java b/server/src/com/cloud/api/commands/AddConfigCmd.java index 0ef2194f64e..00ce03536ae 100644 --- a/server/src/com/cloud/api/commands/AddConfigCmd.java +++ b/server/src/com/cloud/api/commands/AddConfigCmd.java @@ -78,7 +78,6 @@ public class AddConfigCmd extends BaseCmd { catch (Exception ex) { s_logger.error("Exception adding config value: ", ex); throw new ServerApiException(BaseCmd.INTERNAL_ERROR, "Failed to add config value : " + ex.getMessage()); - //test } } From 3fdd7afb3cfac0ef8608596782b313d829126f6a Mon Sep 17 00:00:00 2001 From: "Manuel Amador (Rudd-O)" Date: Wed, 11 Aug 2010 11:03:49 -0700 Subject: [PATCH 5/9] gitignore ignores build number and other stuff now --- .gitignore | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitignore b/.gitignore index e69de29bb2d..603de26f962 100644 --- a/.gitignore +++ b/.gitignore @@ -0,0 +1,2 @@ +build/build.number +bin From b4c09112d4d012b070d141d3eab77bed1ba83cf9 Mon Sep 17 00:00:00 2001 From: "Manuel Amador (Rudd-O)" Date: Wed, 11 Aug 2010 11:04:07 -0700 Subject: [PATCH 6/9] gitignore ignores cloudstack-proprietary --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 603de26f962..ec411c0b279 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ build/build.number bin +cloudstack-proprietary From 5fdeefb4da92e15c7926d4e149dc7a8c68553b46 Mon Sep 17 00:00:00 2001 From: "Manuel Amador (Rudd-O)" Date: Wed, 11 Aug 2010 11:14:52 -0700 Subject: [PATCH 7/9] build number file does not belong in the repo. ignored and deleted. --- build/build.number | 3 --- 1 file changed, 3 deletions(-) delete mode 100644 build/build.number diff --git a/build/build.number b/build/build.number deleted file mode 100644 index 96105fe8c54..00000000000 --- a/build/build.number +++ /dev/null @@ -1,3 +0,0 @@ -#Build Number for ANT. Do not edit! -#Sat Aug 07 12:54:57 PDT 2010 -build.number=927 From 7abe7ed3f61718edf6f6af4574583dc7deab9c65 Mon Sep 17 00:00:00 2001 From: "Manuel Amador (Rudd-O)" Date: Wed, 11 Aug 2010 11:15:40 -0700 Subject: [PATCH 8/9] ignore waf artifacts and temp files, take 2 --- .gitignore | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.gitignore b/.gitignore index ec411c0b279..c3e3e30067b 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,7 @@ build/build.number bin cloudstack-proprietary +.lock-wscript +artifacts +.waf-* +waf-* From eba391d8b87df6eedd8e36f0cf11f579780e85c5 Mon Sep 17 00:00:00 2001 From: "Manuel Amador (Rudd-O)" Date: Wed, 11 Aug 2010 11:16:29 -0700 Subject: [PATCH 9/9] ignore ant artifacts --- .gitignore | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitignore b/.gitignore index c3e3e30067b..e88a658fc77 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,5 @@ cloudstack-proprietary artifacts .waf-* waf-* +target +dist