accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From els...@apache.org
Subject [6/6] accumulo git commit: Merge branch '1.7'
Date Fri, 29 Jan 2016 18:25:23 GMT
Merge branch '1.7'

Conflicts:
	core/.gitignore
	minicluster/.gitignore
	start/.gitignore

Closes apache/accumulo#66


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

Branch: refs/heads/master
Commit: 7a6b48203349f3ba8ca97ba08c8d93935649f562
Parents: 4eadac1 5596b01
Author: Josh Elser <elserj@apache.org>
Authored: Fri Jan 29 12:15:15 2016 -0500
Committer: Josh Elser <elserj@apache.org>
Committed: Fri Jan 29 12:39:36 2016 -0500

----------------------------------------------------------------------
 .gitignore                 |  3 +++
 assemble/.gitignore        |  3 +++
 assemble/pom.xml           |  3 +++
 core/.gitignore            |  3 +++
 core/pom.xml               |  3 +++
 docs/.gitignore            |  3 +++
 examples/simple/.gitignore |  3 +++
 examples/simple/pom.xml    |  3 +++
 fate/.gitignore            |  3 +++
 maven-plugin/.gitignore    |  3 +++
 minicluster/.gitignore     |  3 +++
 pom.xml                    | 12 ++++++++++++
 proxy/.gitignore           |  3 +++
 server/base/.gitignore     |  3 +++
 server/gc/.gitignore       |  3 +++
 server/master/.gitignore   |  3 +++
 server/monitor/.gitignore  |  3 +++
 server/monitor/pom.xml     |  3 +++
 server/native/.gitignore   |  3 +++
 server/tracer/.gitignore   |  3 +++
 server/tserver/.gitignore  |  3 +++
 server/tserver/pom.xml     |  3 +++
 shell/.gitignore           |  4 +++-
 shell/pom.xml              | 17 +++++++++++++++++
 start/.gitignore           |  4 +++-
 test/.gitignore            |  4 ++++
 test/pom.xml               |  3 +++
 trace/.gitignore           |  3 +++
 28 files changed, 108 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/7a6b4820/assemble/pom.xml
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/accumulo/blob/7a6b4820/core/pom.xml
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/accumulo/blob/7a6b4820/examples/simple/pom.xml
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/accumulo/blob/7a6b4820/pom.xml
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/accumulo/blob/7a6b4820/server/monitor/pom.xml
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/accumulo/blob/7a6b4820/server/tserver/pom.xml
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/accumulo/blob/7a6b4820/shell/pom.xml
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/accumulo/blob/7a6b4820/start/.gitignore
----------------------------------------------------------------------
diff --cc start/.gitignore
index e7d7fb1,f97b5ca..e77a822
--- a/start/.gitignore
+++ b/start/.gitignore
@@@ -23,4 -23,7 +23,6 @@@
  /.pydevproject
  /.idea
  /*.iml
- /target/
+ /nbproject/
+ /nbactions.xml
+ /nb-configuration.xml
 -

http://git-wip-us.apache.org/repos/asf/accumulo/blob/7a6b4820/test/pom.xml
----------------------------------------------------------------------


Mime
View raw message