accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ctubb...@apache.org
Subject [9/9] git commit: Merge branch '1.5.2-SNAPSHOT' into 1.6.0-SNAPSHOT
Date Fri, 18 Apr 2014 16:41:00 GMT
Merge branch '1.5.2-SNAPSHOT' into 1.6.0-SNAPSHOT

Conflicts:
	pom.xml


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

Branch: refs/heads/1.6.0-SNAPSHOT
Commit: 1645b4f6297f24ce815c6379acfbc67b334c64ec
Parents: 0550720 0aa1d03
Author: Christopher Tubbs <ctubbsii@apache.org>
Authored: Fri Apr 18 12:37:40 2014 -0400
Committer: Christopher Tubbs <ctubbsii@apache.org>
Committed: Fri Apr 18 12:37:40 2014 -0400

----------------------------------------------------------------------
 pom.xml | 2 ++
 1 file changed, 2 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/1645b4f6/pom.xml
----------------------------------------------------------------------
diff --cc pom.xml
index 10dfcc8,9aeb7ee..f109643
--- a/pom.xml
+++ b/pom.xml
@@@ -520,6 -432,9 +520,8 @@@
              <source>1.6</source>
              <target>1.6</target>
              <optimize>true</optimize>
 -            <encoding>UTF-8</encoding>
+             <showDeprecation>true</showDeprecation>
+             <showWarnings>true</showWarnings>
            </configuration>
          </plugin>
          <plugin>


Mime
View raw message