[54/90] [abbrv] git commit: updated refs/heads/internallb to 1b8a698

[al...@apache.org]

Missing file and updated .gitignore


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

Branch: refs/heads/internallb
Commit: e5d331ee58738dde8aa50d8a119d979b6d04d822
Parents: 3722d66
Author: Alex Huang <al...@gmail.com>
Authored: Mon May 6 06:31:47 2013 -0700
Committer: Alex Huang <al...@gmail.com>
Committed: Mon May 6 16:34:40 2013 -0700

----------------------------------------------------------------------
 .gitignore       |    6 ++----
 services/pom.xml |   37 +++++++++++++++++++++++++++++++++++++
 2 files changed, 39 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e5d331ee/.gitignore
----------------------------------------------------------------------
diff --git a/.gitignore b/.gitignore
index f418628..016554a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -18,10 +18,7 @@
 build/replace.properties
 build/build.number
 bin/
-cloudstack-proprietary/
-premium/
 .lock-wscript
-artifacts/
 .waf-*
 waf-*
 target/
@@ -37,7 +34,7 @@ cloud-*.tar.bz2
 *.egg-info/
 *.prefs
 build.number
-api.log.*.gz
+*.log.*.gz
 cloud.log.*.*
 unittest
 deps/cloud.userlibraries
@@ -59,6 +56,7 @@ tools/cli/build/
 *.iso
 *.tar.gz
 *.tgz
+.*
 target-eclipse
 awsapi/modules/*
 !.gitignore

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e5d331ee/services/pom.xml
----------------------------------------------------------------------
diff --git a/services/pom.xml b/services/pom.xml
new file mode 100644
index 0000000..805bcdb
--- /dev/null
+++ b/services/pom.xml
@@ -0,0 +1,37 @@
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one
+  or more contributor license agreements. See the NOTICE file
+  distributed with this work for additional information
+  regarding copyright ownership. The ASF licenses this file
+  to you under the Apache License, Version 2.0 (the
+  "License"); you may not use this file except in compliance
+  with the License. You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  KIND, either express or implied. See the License for the
+  specific language governing permissions and limitations
+  under the License.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <artifactId>cloudstack-services</artifactId>
+  <name>Apache CloudStack Cloud Services</name>
+  <packaging>pom</packaging>
+  <parent>
+    <groupId>org.apache.cloudstack</groupId>
+    <artifactId>cloudstack</artifactId>
+    <version>4.2.0-SNAPSHOT</version>
+    <relativePath>../pom.xml</relativePath>
+  </parent>
+  <build>
+    <defaultGoal>install</defaultGoal>
+  </build>
+  <modules>
+    <module>console-proxy</module>
+    <module>secondary-storage</module>
+  </modules>
+</project>