forked from TritonDataCenter/smartos-overlay
-
Notifications
You must be signed in to change notification settings - Fork 1
Permalink
Choose a base ref
{{ refName }}
default
Choose a head ref
{{ refName }}
default
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: joshado/smartos-overlay
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: master
Could not load branches
Nothing to show
Loading
Could not load tags
Nothing to show
{{ refName }}
default
Loading
...
head repository: stevenwilliamson/smartos-overlay
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Could not load branches
Nothing to show
Loading
Could not load tags
Nothing to show
{{ refName }}
default
Loading
Able to merge.
These branches can be automatically merged.
- 10 commits
- 10 files changed
- 6 contributors
Commits on Jul 16, 2013
-
TritonDataCenter/smartos-live#233:
logadm
errorsRob Gulewich committedJul 16, 2013 Configuration menu - View commit details
-
Copy full SHA for 4750f38 - Browse repository at this point
Copy the full SHA 4750f38View commit details
Commits on Jul 29, 2013
-
STOR-87 upgrading across STOR-84 requires dump device reinitialization
Bill Pijewski committedJul 29, 2013 Configuration menu - View commit details
-
Copy full SHA for 8f218bb - Browse repository at this point
Copy the full SHA 8f218bbView commit details
Commits on Nov 27, 2013
-
Configuration menu - View commit details
-
Copy full SHA for fa81a8d - Browse repository at this point
Copy the full SHA fa81a8dView commit details
Commits on Dec 16, 2013
-
FWAPI-107: Be more explicit about which rules affect all VMs
Rob Gulewich committedDec 16, 2013 Configuration menu - View commit details
-
Copy full SHA for 4af9747 - Browse repository at this point
Copy the full SHA 4af9747View commit details
Commits on Jan 15, 2014
-
Configuration menu - View commit details
-
Copy full SHA for 95bf1ed - Browse repository at this point
Copy the full SHA 95bf1edView commit details
Commits on Apr 10, 2014
-
Merge branch 'joyent_20140403' into updates_from_joyent
Conflicts: lib/svc/method/fs-joyent
Configuration menu - View commit details
-
Copy full SHA for 4542ad2 - Browse repository at this point
Copy the full SHA 4542ad2View commit details -
Configuration menu - View commit details
-
Copy full SHA for 9852c03 - Browse repository at this point
Copy the full SHA 9852c03View commit details
Commits on May 13, 2014
-
Configuration menu - View commit details
-
Copy full SHA for d4ba846 - Browse repository at this point
Copy the full SHA d4ba846View commit details
Commits on May 21, 2014
-
Configuration menu - View commit details
-
Copy full SHA for 65ea792 - Browse repository at this point
Copy the full SHA 65ea792View commit details
Commits on Apr 2, 2015
-
Merge in fa-release-20150402 branch
- Contains all upstream changes to date Squashed commit of the following: commit 0359906 Merge: 65ea792 d689fc2 Author: Steven Williamson <[email protected]> Date: Thu Apr 2 16:37:19 2015 +0100 Merge remote-tracking branch 'joyent/release-20150402' into merge-wip commit d689fc2 Author: Adam Števko <[email protected]> Date: Mon Oct 20 21:49:25 2014 +0200 TritonDataCenter#27 admin_network should hold network address instead of '...' (Setting admin_network shouldn't break DHCP configuration) Reviewed by: Rob Gulewich <[email protected]> commit d0ab614 Author: Adam Števko <[email protected]> Date: Mon Oct 13 22:49:36 2014 +0200 TritonDataCenter#27 admin_network should hold network address instead of '...' Reviewed by: Rob Gulewich <[email protected]> commit 3c30ef2 Author: Keith M Wesolowski <[email protected]> Date: Thu Aug 28 00:29:41 2014 +0000 OS-3353 a few files are missing license and copyright statements (missed file) commit 4fdf321 Author: Keith M Wesolowski <[email protected]> Date: Thu Aug 28 00:26:26 2014 +0000 OS-3353 a few files are missing license and copyright statements commit 3d3edf1 Author: Joshua M. Clulow <[email protected]> Date: Wed Jul 9 21:45:57 2014 -0700 OS-3150 upgrade NTP to ntp-dev-4.2.7p446 OS-2309 enough is enough: ntpd mustn't hang on unreachable servers commit 8f7e3e2 Author: Josh Wilsdon <[email protected]> Date: Tue Jun 3 19:31:57 2014 +0000 OS-2769 generated ntp.conf should ignore everything by default but allow localhost and admin network
Configuration menu - View commit details
-
Copy full SHA for 4de0674 - Browse repository at this point
Copy the full SHA 4de0674View commit details
Loading
This comparison is taking too long to generate.
Unfortunately it looks like we can’t render this comparison for you right now. It might be too big, or there might be something weird with your repository.
You can try running this command locally to see the comparison on your machine:
git diff master...master