Merge branch 'master' of github.com:apache/incubator-trafodion into sean_traf
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/896d2a17 Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/896d2a17 Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/896d2a17 Branch: refs/heads/master Commit: 896d2a17ed43ea72ba1814d7b35fb99aaf58cd2d Parents: 4742258 fabfc80 Author: Sean Broeder <[email protected]> Authored: Sun Feb 28 13:13:58 2016 +0000 Committer: Sean Broeder <[email protected]> Committed: Sun Feb 28 13:13:58 2016 +0000 ---------------------------------------------------------------------- .../org/trafodion/phoenix/end2end/DescColumnSortOrderTest.java | 2 +- .../java/org/trafodion/phoenix/end2end/ProductMetricsTest.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) ----------------------------------------------------------------------
