Clone
Mike Brock <brockm@gmail.com>
committed
on 25 Mar 13
Merge remote-tracking branch 'remotes/upstream/master' into 3.0
Migrate fix for ERRAI-528 from master

Conflicts:
errai-bus/pom.xml
errai-… Show more
Merge remote-tracking branch 'remotes/upstream/master' into 3.0

Migrate fix for ERRAI-528 from master

Conflicts:

        errai-bus/pom.xml

        errai-cdi/weld-integration/src/test/java/org/jboss/errai/cdi/ErraiCDITestSuite.java

        errai-cdi/weld-integration/src/test/java/org/jboss/errai/cdi/injection/client/test/InjectionIntegrationTest.java

        errai-ioc/src/main/java/org/jboss/errai/ioc/client/container/AbstractIOCBean.java

        errai-ioc/src/main/java/org/jboss/errai/ioc/client/container/SyncBeanManagerImpl.java

        errai-ioc/src/main/java/org/jboss/errai/ioc/rebind/ioc/bootstrapper/IOCBootstrapGenerator.java

Show less

2.4 + 20 more