Nmsupgrademerge #762
Open
Nmsupgrademerge #762
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
# Conflicts: # kilkari/src/main/java/org/motechproject/nms/kilkari/service/impl/MctsBeneficiaryImportServiceImpl.java # kilkari/src/main/java/org/motechproject/nms/kilkari/service/impl/SubscriberServiceImpl.java # mcts/src/main/java/org/motechproject/nms/mcts/service/impl/MctsWsImportServiceImpl.java # rch/src/main/java/org/motechproject/nms/rch/service/impl/RchWebServiceFacadeImpl.java
Added 'LocationService' to mcts, rch blueprint
…tivated_Subscriptions corrections in child import, removing nullpointer exceptions
…a_healthblock' join table
…into feature_nic_new_locations
…_update child update with mother null bug fix
…s_village_healthsubfacility' join table
…_performance # Conflicts: # kilkari/src/main/java/org/motechproject/nms/kilkari/service/impl/MctsBeneficiaryImportServiceImpl.java
…-implementations/nms into feature_nic_new_locations_local
…n job, and adding rch import to the hold to active procedure
…ses ajcclosure class not dound. aAdded imports required for testing bundle
…otech modules ( for ma, props, flw, flwupgrade)
…rator -- set is used. Because if custom set is used -- we have to write entire wrapper for it ad we dont need it CollectionFactory also return HashSet/ArrayList whwn class is either set/Hashset. Fixed FLW test cases.
…d tests" This reverts commit 493a746.
…into nmsIntegrationTests # Conflicts: # testing/src/test/java/org/motechproject/nms/testing/it/api/UserControllerBundleIT.java
gudipatiharitha
force-pushed
the
nmsupgrade
branch
from
bc46e19
to
863a433
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Merged nms upgrade to master