[35/50] [abbrv] git commit: Sync changes: Merge branch 'master' into api_refactoring

[ah...@apache.org]

Sync changes: Merge branch 'master' into api_refactoring

Conflicts:
	plugins/network-elements/dns-notifier/pom.xml

Signed-off-by: Rohit Yadav <bh...@apache.org>


Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/077f4719
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/077f4719
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/077f4719

Branch: refs/heads/javelin
Commit: 077f47193d773e4fd193366117a75d45869d62c5
Parents: d613c59 4f98d87
Author: Rohit Yadav <bh...@apache.org>
Authored: Tue Jan 8 20:33:08 2013 -0800
Committer: Rohit Yadav <bh...@apache.org>
Committed: Tue Jan 8 20:36:17 2013 -0800

----------------------------------------------------------------------
 plugins/hypervisors/simulator/pom.xml         |    3 +--
 plugins/network-elements/dns-notifier/pom.xml |    1 -
 2 files changed, 1 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/077f4719/plugins/network-elements/dns-notifier/pom.xml
----------------------------------------------------------------------
diff --cc plugins/network-elements/dns-notifier/pom.xml
index 8c6b485,be68e99..ea35d78
--- a/plugins/network-elements/dns-notifier/pom.xml
+++ b/plugins/network-elements/dns-notifier/pom.xml
@@@ -27,8 -27,7 +27,7 @@@
    </parent>
    <groupId>org.apache.cloudstack</groupId>
    <artifactId>cloud-plugin-example-dns-notifier</artifactId>
-   <version>4.1.0-SNAPSHOT</version>
 -  <name>CloudStack Dns Notifier Example</name>
 +  <name>Apache CloudStack Plugin - Dns Notifier Example</name>
    <description>This is sample source code on how to write a plugin for CloudStack</description>
    <build>
      <defaultGoal>install</defaultGoal>