[Windup-commits] [windup/windup] a4786c: Fixes to issues due to a bad rebase

Branch: refs/heads/master Home: https://github.com/windup/windup Commit: a4786cca2f183d67581f93587fedb81f6d9e06db https://github.com/windup/windup/commit/a4786cca2f183d67581f93587fedb81f6... Author: Jess Sightler <jesse.sightler(a)gmail.com&gt; Date: 2014-08-07 (Thu, 07 Aug 2014) Changed paths: M config/api/src/main/java/org/jboss/windup/config/RuleSubset.java M graph/tests/src/test/java/org/jboss/windup/graph/test/EventGraphTest.java M graph/tests/src/test/java/org/jboss/windup/graph/typedgraph/InMemoryFrameTest.java M graph/tests/src/test/java/org/jboss/windup/graph/typedgraph/TestFooModel.java M graph/tests/src/test/java/org/jboss/windup/graph/typedgraph/WindupPropertyMethodHandlerTest.java Log Message: ----------- Fixes to issues due to a bad rebase Commit: d11f804a07d0f01066cd5fa00496c47441634b45 https://github.com/windup/windup/commit/d11f804a07d0f01066cd5fa00496c4744... Author: Lincoln Baxter, III <lincolnbaxter(a)gmail.com&gt; Date: 2014-08-07 (Thu, 07 Aug 2014) Changed paths: M config/api/src/main/java/org/jboss/windup/config/RuleSubset.java M graph/tests/src/test/java/org/jboss/windup/graph/test/EventGraphTest.java M graph/tests/src/test/java/org/jboss/windup/graph/typedgraph/InMemoryFrameTest.java M graph/tests/src/test/java/org/jboss/windup/graph/typedgraph/TestFooModel.java M graph/tests/src/test/java/org/jboss/windup/graph/typedgraph/WindupPropertyMethodHandlerTest.java Log Message: ----------- Merge pull request #173 from jsight/fix_rebase_mistake Fixes to issues due to a bad rebase Compare: https://github.com/windup/windup/compare/062b3cf0dc48...d11f804a07d0