Skip to content
Permalink

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.
base repository: netifi/netifi-java
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: develop
Choose a base ref
...
head repository: netifi/netifi-java
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: feature/rsocket-1.0.0-prioritization
Choose a head ref
Checking mergeability… Don’t worry, you can still create the pull request.
  • 4 commits
  • 76 files changed
  • 2 contributors

Commits on Dec 17, 2019

  1. provides updates to latest rsocket and rsocket-rpc

    @OlegDokuka
    OlegDokuka committed Dec 17, 2019
    Configuration menu
    Copy the full SHA
    60b5fbb View commit details
    Browse the repository at this point in the history

Commits on Dec 20, 2019

  1. Merge remote-tracking branch 'rebranded/develop' into develop 

    # Conflicts:
#	netifi-broker-client/src/main/java/com/netifi/broker/DefaultBuilderConfig.java
#	netifi-spring-core/src/main/java/com/netifi/spring/core/DestinationAwareClientFactory.java
#	netifi-spring-core/src/main/java/com/netifi/spring/core/annotation/BrokerClientStaticFactory.java
    @OlegDokuka
    OlegDokuka committed Dec 20, 2019
    Configuration menu
    Copy the full SHA
    21bec77 View commit details
    Browse the repository at this point in the history

Commits on Dec 23, 2019

  1. ci: get building on os x

    Alan Scherger
    Alan Scherger committed Dec 23, 2019
    Configuration menu
    Copy the full SHA
    6d5556a View commit details
    Browse the repository at this point in the history

  2. ci: fix locks - ONLY WORKS ON OSX

    Alan Scherger
    Alan Scherger committed Dec 23, 2019
    Configuration menu
    Copy the full SHA
    be4c8df View commit details
    Browse the repository at this point in the history
Loading