Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.

...

5 commits
8 files changed
1 contributor

Commits on Jun 5, 2013

TRUNK-3944: Incorrect mockito, hamcrest and junit dependencies
```
(cherry picked from commit 0a53179)

Conflicts:
	pom.xml
	test/pom.xml
```
rkorytkowski committed Jun 5, 2013
Copy the full SHA

d352932 View commit details

Browse the repository at this point in the history
TRUNK-3944: Updated junit to 4.11 and fixed tests
```
(cherry picked from commit b2889f1)

Conflicts:
	api/src/test/java/org/openmrs/api/ConceptServiceTest.java
```
rkorytkowski committed Jun 5, 2013
Copy the full SHA

35b7ba4 View commit details

Browse the repository at this point in the history
TRUNK-3944: Created OpenmrsMatchers
```
(cherry picked from commit e37a2e9)

Conflicts:
	api/src/test/java/org/openmrs/api/ConceptServiceTest.java
```
rkorytkowski committed Jun 5, 2013
Copy the full SHA

b689bc4 View commit details

Browse the repository at this point in the history
TRUNK-3944: Responded to review comments
```
(cherry picked from commit 56c743b)

Conflicts:
	api/src/test/java/org/openmrs/api/ConceptServiceTest.java
```
rkorytkowski committed Jun 5, 2013
Copy the full SHA

7789c43 View commit details

Browse the repository at this point in the history
TRUNK-3944: Responded to more review comments
```
(cherry picked from commit 171f0cf)
```
rkorytkowski committed Jun 5, 2013
Copy the full SHA

2e7ae93 View commit details

Browse the repository at this point in the history