Nikolay Amiantov
b2d5326e3a
sdl-jstest: update package
2015-07-28 12:33:30 +03:00
Nikolay Amiantov
3a2275dd84
imgurbash: add package
2015-07-28 12:33:29 +03:00
Benjamin Staffin
8de7d148c8
awscli: Make bash and zsh completions work
2015-07-28 01:14:34 -07:00
Tobias Geerinckx-Rice
e8596c189f
colordiff: 1.0.13 -> 1.0.15
...
Changes:
- Big improvements to side-by-side diff detection
- Additional colordiffrc example colour scheme file to match 'git diff'
- Misc fixes
2015-07-27 01:54:08 +02:00
Tobias Geerinckx-Rice
08f866d887
xdelta: 3.0.9 -> 3.0.10
2015-07-27 01:54:08 +02:00
Eelco Dolstra
f98c7f2976
More docs in separate outputs
2015-07-26 22:46:45 +02:00
Eelco Dolstra
6a91bf20c8
groff: Move docs to separate output
...
This cuts the size of the package by ~10 MB.
2015-07-26 22:46:44 +02:00
Eelco Dolstra
48efe637ac
xdg-utils: Don't depend on "which"
2015-07-26 22:46:23 +02:00
Tobias Geerinckx-Rice
df6381afec
stress-ng: 0.04.11 -> 0.04.12
...
Fixes/features:
* Fix segfault in metrics because MMAPFORK macro not defined correctly
* Add --cpu-load-slice option for CPU stressor time slice tweaks
2015-07-24 22:03:32 +02:00
Vladimír Čunát
a2f16fdcff
Merge branch 'staging'
2015-07-24 15:12:28 +02:00
lethalman
5d60c20fd8
Merge pull request #8731 from cheecheeo/fzf-master
...
fzf
2015-07-24 10:13:01 +02:00
William A. Kennington III
0e1d8f0d7d
ceph-git: 2015-07-20 -> 2015-07-23
2015-07-23 15:15:02 -07:00
William A. Kennington III
6d30af58a0
ceph: Fix detection of git versioning
2015-07-23 15:14:50 -07:00
Domen Kožar
6492dc8900
Merge pull request #8928 from brodul/borg
...
Add borg backup software (fork of attic)
2015-07-23 23:31:36 +02:00
Samuel Rivas
55ad2d2150
Fix wyrd to compile with ocaml 4.02
...
camlp4 is now a separate package instead of shipping within the ocaml package
2015-07-23 19:50:01 +02:00
Peter Simons
dc5084b4d1
nixops: fix Emacs syntax highlighting
2015-07-23 19:47:43 +02:00
Peter Simons
5fcdd7c0dc
nixopsUnstable: disable broken documentation build
2015-07-23 19:47:16 +02:00
Tobias Geerinckx-Rice
dfeaaa8909
geolite-legacy: use correct local naming scheme
...
Following http://dev.maxmind.com/geoip/legacy/install/city/ :
"Then rename the *.dat file to GeoIP.dat, GeoIPRegion.dat, or
GeoIPCity.dat, for the GeoIP Country, Region or City databases,
respectively."
Using the default "GeoLiteCity*.dat" name caused ipv6calc to miss it
(verified using `ipv6calc -vv`).
2015-07-23 04:09:15 +02:00
Tobias Geerinckx-Rice
72fd2a609c
ipv6calc: make geoip and geolite-legacy "optional"
2015-07-23 03:12:22 +02:00
Tobias Geerinckx-Rice
0c00290fbb
ipv6calc: 0.98.0 -> 0.99.0
2015-07-23 03:12:22 +02:00
Tobias Geerinckx-Rice
c805663bf4
stress-ng: 0.04.10 -> 0.04.11
...
Changes: https://launchpad.net/ubuntu/+source/stress-ng/+changelog
2015-07-23 03:12:21 +02:00
Arseniy Seroka
fad983f95f
Merge pull request #8960 from fpletz/package/horst
...
horst: init at git-2015-07-22
2015-07-23 02:31:51 +03:00
Franz Pletz
6079babed8
horst: init at git-2015-07-22
2015-07-23 01:18:16 +02:00
William A. Kennington III
ac36ed18eb
dhcpcd: 6.9.0 -> 6.9.1
2015-07-22 14:33:06 -07:00
Vladimír Čunát
2cacf77c13
Merge branch 'master' into staging
2015-07-22 22:33:55 +02:00
Arseniy Seroka
1b8933f8f3
Merge pull request #8942 from bendlas/i2p-update
...
i2p: 0.9.19 -> 0.9.20
2015-07-22 23:12:36 +03:00
Luca Bruno
92150ef3ac
zerotierone: doesn't build on i686 (ZHF)
2015-07-22 20:27:53 +02:00
William A. Kennington III
b827583831
sudo: 1.8.14p1 -> 1.8.14p3
2015-07-22 11:26:59 -07:00
Luca Bruno
befef13d37
chaps: not supported on i686 (ZHF)
2015-07-22 11:37:38 +02:00
Luca Bruno
6151349d07
partclone: fix download (ZHF)
2015-07-22 10:58:21 +02:00
Herwig Hochleitner
604dfd33f4
i2p: 0.9.19 -> 0.9.20
2015-07-22 10:33:31 +02:00
Dan Peebles
75a7f96b44
knockknock: minor cleanup
2015-07-22 01:32:09 +00:00
Dan Peebles
a8c7abdb8d
knockknock: init
...
A simple but secure port knocking daemon and associated tool (NixOS modules upcoming)
2015-07-22 01:26:40 +00:00
Arseniy Seroka
91289b13d4
Merge pull request #8926 from dezgeg/pr-memtester
...
memtester: init at 4.3.0
2015-07-22 01:34:52 +03:00
Arseniy Seroka
431555f86b
Merge pull request #8934 from ollieh/ksuperkey
...
ksuperkey: init
2015-07-22 01:33:42 +03:00
Oliver Hunt
a855efe7db
ksuperkey: init
2015-07-21 21:37:29 +00:00
Andraz Brodnik
b655b1c49d
Add borg backup software (fork of attic)
...
Borg is a fork of attic backup software. It is more actively developed,
with more features.
2015-07-21 20:41:13 +02:00
Tuomas Tynkkynen
8de63957a5
memtester: init at 4.3.0
2015-07-21 19:59:41 +03:00
Edward Tjörnhammar
f7d962cd42
aiccu: patch gnutls api change
2015-07-21 10:48:36 +02:00
Austin Seipp
3793ff5290
nixpkgs: torsocks 2.0.0 -> 2.1.0
...
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2015-07-20 21:50:29 -05:00
Austin Seipp
4a6b7fc563
nixpkgs: stunnel 5.16 -> 5.20
...
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2015-07-20 21:50:29 -05:00
William A. Kennington III
17d045c74b
ceph-git: 2015-07-15 -> 2015-07-20
2015-07-20 18:07:16 -07:00
Austin Seipp
c2f1ac9885
nixpkgs: ssdeep 2.12 -> 2.13
...
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2015-07-20 13:52:34 -05:00
Austin Seipp
cbf14b9d8f
nixpkgs: dd-agent 5.2.3 -> 5.4.3
...
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2015-07-20 13:52:33 -05:00
Georges Dubus
eb9475d110
nox: updated to 0.0.2
2015-07-20 17:09:33 +02:00
Rok Garbas
46516fc19e
connmanui: update to latest (e4a8ddcca08 -> fce0af94e12)
2015-07-20 16:53:50 +02:00
Peter Simons
07fd9384f5
texlive: flip the default for the assertion so that normal users can build it
2015-07-20 16:39:39 +02:00
Vladimír Čunát
52b3546e4a
merge #8617 : recoll: filters for LaTeX, RTF, and WP
2015-07-20 11:00:04 +02:00
Vladimír Čunát
1fee4ce381
nzbget: fix URLs, fixes #8860
...
/cc maintainer @pSub.
2015-07-20 09:57:01 +02:00
William A. Kennington III
6eab1065f1
ceph: Fix wrapper path
2015-07-19 19:44:48 -07:00
William A. Kennington III
05c0fc15c0
Merge branch 'master.upstream' into staging.upstream
2015-07-19 15:20:04 -07:00
Arseniy Seroka
fcd855fa7f
Merge pull request #8883 from joachifm/dnscrypt-proxy-1_6_0
...
dnscrypt-proxy: 1.5.0 -> 1.6.0
2015-07-20 00:33:04 +03:00
William A. Kennington III
8734f01830
sudo: 1.8.13 -> 1.8.14p1
2015-07-19 12:09:14 -07:00
William A. Kennington III
8d4f9d8d6b
ceph: Add missing boost 1.58 compat patch
2015-07-19 12:03:28 -07:00
William A. Kennington III
2ad250f4fa
Merge branch 'staging.next' into staging.upstream
2015-07-19 02:21:28 -07:00
Vladimír Čunát
9a80550cc4
Merge branch 'staging', discussion #8844
2015-07-19 08:09:29 +02:00
Tobias Geerinckx-Rice
84aea56778
netsniff-ng: 0.5.9-{27-g3beaa23 -> 34-g95c4582}
...
Several flowtop fixes/enhancements.
2015-07-18 23:45:37 +02:00
Joachim Fasting
b9895740ba
dnscrypt-proxy: 1.5.0 -> 1.6.0
2015-07-18 20:31:18 +02:00
William A. Kennington III
8420f5c483
ceph: Boost 1.58 compat
2015-07-17 20:39:12 -07:00
William A. Kennington III
754f21df19
file: Fix hash
2015-07-17 14:37:48 -07:00
William A. Kennington III
fd5f56dc50
file: 5.23 -> 5.24
2015-07-17 14:37:20 -07:00
William A. Kennington III
1caf3e1724
Merge branch 'master.upstream' into staging.next
2015-07-17 14:34:56 -07:00
Arseniy Seroka
37c09b0433
Merge pull request #8865 from rycee/update/socat
...
socat2pre: 2.0.0-b7 -> 2.0.0-b8
2015-07-18 00:29:46 +03:00
Lluís Batlle i Rossell
ce597e1e1b
updating tor to 0.2.6.10
...
I checked the tarball signature.
I fixed the optimised build (broken since 2013) and I added seccomp.
2015-07-17 18:24:35 +02:00
Peter Simons
32a81524fe
release-lib: rename config option "inHydra" to "allowTexliveBuilds"
...
Also, take the value of that attribute as an argument to the module so
that Hydra maintainers who don't mind building TexLive have a chance to
do so.
2015-07-17 14:13:40 +02:00
Vladimír Čunát
9f37e91ec5
Merge master into staging
...
There are larger-rebuild changes: gnutls and samba.
2015-07-17 06:38:04 +02:00
William A. Kennington III
967abfc786
efivar: 0.20 -> 0.21
2015-07-16 20:07:17 -07:00
William A. Kennington III
da5e25dcaa
tinc: 2015-06-20 -> 2015-07-17
2015-07-16 20:07:17 -07:00
William A. Kennington III
97d8c1cb23
tinc: 1.0.25 -> 1.0.26
2015-07-16 20:07:17 -07:00
Robert Helgesson
12ec56030e
socat2pre: 2.0.0-b7 -> 2.0.0-b8
2015-07-16 23:27:04 +02:00
goibhniu
a076e4bee6
Merge pull request #8864 from rycee/package/gmic
...
gmic: init at 1.6.5.0
2015-07-16 22:50:16 +02:00
Robert Helgesson
6a1519c631
gmic: init at 1.6.5.0
2015-07-16 22:02:21 +02:00
Luca Bruno
60d19b3adc
Revert "gnupg: fix build on darwin"
...
This reverts commit db3602b5d6
.
Fixed libusb build by 82d2960f15
2015-07-16 10:36:29 +02:00
John Chee
17c1428bfb
fzf: 0.9.13 -> 0.10.0
2015-07-15 19:59:20 -07:00
William A. Kennington III
3adb0e713c
ceph: 2015-06-06 -> 2015-07-15
2015-07-15 17:46:45 -07:00
William A. Kennington III
c1c757cea4
ceph: 9.0.1 -> 9.0.2
2015-07-15 17:46:31 -07:00
William A. Kennington III
0861cb2c7d
Merge pull request #8845 from rycee/fix/dtach-CVE-2012-3368
...
dtach: fix CVE-2012-3368
2015-07-15 17:41:45 -07:00
William A. Kennington III
c8c11371b9
Merge pull request #8732 from lovek323/gnupg-darwin
...
gnupg: fix build on darwin
2015-07-15 17:37:59 -07:00
Bjørn Forsman
9ad01e41de
eplot: init at 2.07
...
Create plots quickly with gnuplot.
http://liris.cnrs.fr/christian.wolf/software/eplot/
2015-07-15 23:37:33 +02:00
Robert Helgesson
d68d929291
dtach: fix CVE-2012-3368
2015-07-15 18:19:46 +02:00
Joachim Fasting
4bd52ddb88
untex: init at 1.2
2015-07-15 17:03:18 +02:00
Joachim Fasting
bcb314853a
unrtf: init at 0.21.9
2015-07-15 17:03:17 +02:00
Bjørn Forsman
2926f3aa2c
fgallery: init at 1.7
...
fgallery is a static photo gallery generator.
http://www.thregr.org/~wavexx/software/fgallery/
2015-07-15 16:02:37 +02:00
William A. Kennington III
25e60feb72
Merge branch 'master.upstream' into staging.upstream
2015-07-15 02:02:46 -07:00
William A. Kennington III
369febb956
btrfsprogs: 4.1.1 -> 4.1.2
2015-07-15 01:58:34 -07:00
ts468
c930417537
Merge pull request #8830 from ts468/upstream.tpm-luks
...
tpm-luks: update -> git-2015-07-11
2015-07-15 10:52:20 +02:00
Thomas Strobel
127300a51d
tpm-luks: update -> git-2015-07-11
2015-07-15 10:22:40 +02:00
Tobias Geerinckx-Rice
a42b2e5f85
netsniff-ng 0.5.9-21-g8c75168 -> 0.5.9-27-g3beaa23
...
Functional changes:
- trafgen: Print min packet size in error message
- flowtop man: Add note about activating netfilter connection tracking
- flowtop: Fix flows disappearing
- flowtop: Fix hanging while waiting for collector
2015-07-15 03:31:54 +02:00
Arseniy Seroka
2fa88f65ea
Merge pull request #8812 from k0ral/xurls
...
xurls: init at 0.6.0
2015-07-14 14:13:08 +03:00
koral
562f760f20
xurls: init at 0.6.0
2015-07-14 08:27:29 +00:00
William A. Kennington III
333f145d76
Merge branch 'master.upstream' into staging.upstream
2015-07-13 15:11:31 -07:00
Maciek Starzyk
d3284944a1
obnam: 1.8 -> 1.12
2015-07-13 23:44:56 +02:00
William A. Kennington III
d253b3d875
coreutils: Skip sparse cp test as it fails reliably with btrfs on ubuntu 14.04
2015-07-13 13:48:59 -07:00
William A. Kennington III
b2ae45bd77
btrfsProgs: Cleanup some old build changes
...
The change of optimization flags should be safe for all platforms as
the default for most applications is -O2. It is also unecessary to
forcefully link against libgcc_s as btrfsprogs no longer errors when
scrubbing without this linkage.
2015-07-13 12:34:06 -07:00
Pascal Wittmann
1e9561ff39
bareos: fix build (ZHF)
2015-07-13 13:43:11 +02:00
Tuomas Tynkkynen
3b81288a58
debbindiff: init at version 26
...
[Bjørn: set namePrefix = "" to align attrname/pkgname, break overlong
lines, change patchPhase into postPatch so that 'patches' can still be
used.]
2015-07-13 08:31:55 +02:00
Tuomas Tynkkynen
2ad7463144
pythonPackages.magic: Fix loading libmagic.so
...
Even with the previous `python.patch` file around, libmagic.so isn't
found. Instead patch it to use an absolute path, using a similar
approach that is used by the `python_magic` package (which is another
libmagic python wrapper library as well).
2015-07-13 08:29:05 +02:00
Pascal Wittmann
dc608ff237
sbsigntool: fix build (ZHF)
2015-07-12 23:41:10 +02:00
James Cook
a456168e5b
Merge pull request #6702 from joachifm/dnscrypt-proxy
...
nixos: some improvements for dnscrypt-proxy
2015-07-12 00:17:46 -07:00
James Cook
6393688806
Merge pull request #8747 from ikervagyok/btrfs
...
btrfs-progs: 4.1 -> 4.1.1
2015-07-12 00:00:27 -07:00
John Chee
ec6e64a371
fzf: add magnetophon as a maintainer
2015-07-11 10:30:51 -07:00
Lengyel Balázs
3c163467aa
btrfs-progs: 4.1 -> 4.1.1
2015-07-11 14:30:15 +02:00
Pascal Wittmann
3c47a9980c
crackxls: do not use march=native and mtune=native
...
patch is from @dezgeg and is contained in #8530
2015-07-11 12:23:21 +02:00
John Chee
9e2da99cc7
fzf: whitespace
2015-07-10 10:52:23 -07:00
Rickard Nilsson
6c6a06b99f
httping: Enable SSL support
2015-07-10 12:58:56 +02:00
William A. Kennington III
48f44bfa69
grub2: 2015-05-14 -> 2015-07-05
2015-07-09 22:17:54 -07:00
John Chee
fb371c0642
fzf: init at 0.9.13
...
patch by @magnetophon
2015-07-09 18:05:14 -07:00
Jason "Don" O'Conal
db3602b5d6
gnupg: fix build on darwin
2015-07-10 10:18:29 +10:00
Pascal Wittmann
0723117f4c
haproxy: update from 1.5.11 to 1.5.14, fixes CVE-2015-3281
2015-07-09 20:21:24 +02:00
Tobias Geerinckx-Rice
98e7674e88
nxproxy, libxcomp: nxlibs 3.5.0.{31 -> 32}
...
Removes the need for patching (for now).
2015-07-09 02:41:26 +02:00
William A. Kennington III
7cda24c01e
Merge branch 'master.upstream' into staging.upstream
2015-07-08 14:11:16 -07:00
William A. Kennington III
bd82a79fc1
xorriso: 1.3.8 -> 1.4.0
2015-07-08 11:28:54 -07:00
Sander van der Burg
e54d0371b9
disnix: bump to version 0.4
2015-07-08 12:03:56 +00:00
Edward Tjörnhammar
2dfe7d0513
i2pd: 0.9.0 -> 0.10.0
2015-07-07 09:47:22 +02:00
William A. Kennington III
e587d3e155
Merge branch 'master.upstream' into staging.upstream
2015-07-07 00:31:00 -07:00
William A. Kennington III
243b2f79ce
openssh: 6.8p1 -> 6.9p1
2015-07-06 19:30:02 -07:00
William A. Kennington III
81ace52e89
openssh: Refactor and install sample config files
2015-07-06 19:29:45 -07:00
William A. Kennington III
6aa4714dba
coreutils: 8.23 -> 8.24
2015-07-06 17:37:18 -07:00
William A. Kennington III
ae28ff8b91
Merge branch 'master.upstream' into staging.upstream
2015-07-06 17:15:11 -07:00
William A. Kennington III
9eae9dd811
gnupg: 2.0.27 -> 2.0.28
2015-07-06 17:14:01 -07:00
Arseniy Seroka
6d99ecf300
Merge pull request #8658 from benley/iftop-darwin
...
iftop: fix Darwin build
2015-07-06 14:27:13 +03:00
Arseniy Seroka
83083da5b1
Merge pull request #8651 from ts468/upstream.sbsigntool
...
sbsigntool: init at 0.5
2015-07-06 14:26:39 +03:00
lethalman
8212ec8d55
Merge pull request #8659 from robbinch/pkg-gitfs
...
gitfs: init at 0.2.5.
2015-07-06 11:24:49 +02:00
Robbin C
945ac597b9
gitfs: init at 0.2.5
...
This adds gitfs, a FUSE filesystem that fully integrates with git.
2015-07-06 17:10:17 +08:00
William A. Kennington III
fbfdc139d6
Merge branch 'master.upstream' into staging.upstream
2015-07-05 18:36:16 -07:00
Benjamin Staffin
806291b42e
iftop: fix Darwin build
2015-07-05 17:47:54 -07:00
William A. Kennington III
fe705a664c
gnupg: 2.1.5 -> 2.1.6
2015-07-05 16:51:03 -07:00
William A. Kennington III
d605663ae2
Merge branch 'master.upstream' into staging.upstream
2015-07-05 13:06:02 -07:00
William A. Kennington III
282e7e6c84
Merge pull request #8647 from ts468/upstream.trusted_grub
...
trustedGRUB: GRUB 1 based -> GRUB 2 based
2015-07-05 11:52:13 -07:00
Thomas Strobel
c9e5218b33
sbsigntool: init at 0.5
2015-07-05 14:59:01 +02:00
Tuomas Tynkkynen
167cf5c0da
asymptote: Fix source URL
...
The particular mirror (softlayer-ams.dfl.sourceforge.net) seems to be
down (no DNS entry).
2015-07-05 14:31:46 +03:00
Thomas Strobel
2285ad1bfa
trustedGRUB: GRUB 1 based -> GRUB 2 based
2015-07-05 11:48:36 +02:00
aszlig
2467c437b7
xdg_utils: Fix wrong substitution of grep command.
...
Fixes regression introduced by 16406e63b3
.
Not replacing "egrep" with a negated character class on [^e] needs to be
put back into the replacement, because if we have something like:
foo="$(grep xxx)"
The replacement would be something like this:
foo="$/nix/store/.../bin/grep xxx)"
Which will lead to wrong behavior and in cases of for example
"xdg-screensaver", even directly to a syntax error:
xdg-screensaver: line 178: syntax error near unexpected token `('
xdg-screensaver: line 178: `command="/nix/store/.../bin/grep -E
"^Exec(\[[^]=]*])?=" "$file" |
/nix/store/.../bin/cut -d= -f 2- |
first_word`"'
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2015-07-05 09:25:13 +02:00
Thomas Strobel
36f2ec82cc
tmp-luks: init at 0.9pre
2015-07-04 23:57:59 +02:00
Michael Raskin
d2cfc1dec6
Mailsend: update 1.17b15 -> 1.18
2015-07-05 00:32:54 +03:00
Michael Raskin
8454055ed4
GlusterFS: update 3.7.1 -> 3.7.2
2015-07-05 00:32:53 +03:00
Arseniy Seroka
093a8994f9
Merge pull request #8624 from ambrop72/minidlna-update
...
minidlna 1.1.4
2015-07-04 13:59:32 +03:00
Arseniy Seroka
a9a2868095
Merge pull request #8626 from ts468/upstream.chaps
...
New: chaps: PKCS #11 implementation with TPM backend
2015-07-04 13:58:06 +03:00
Thomas Strobel
b73e917237
chaps: init at version 0.42-6812
...
Chaps is a PKCS #11 implementation with TPM backend.
2015-07-04 12:53:09 +02:00
Ambroz Bizjak
42a5ad5c5e
minidlna: 1.0.25 -> 1.1.4
...
Changes:
- gettext is needed to build
- Switched to using non-legacy ffmpeg.
- Removed ffmpeg stuff from include path since it causes build errors related to
a time.h header.
- Removed unneeded patch.
- Adjusted NixOS service due to the binary being renamed.
2015-07-04 09:16:28 +02:00
Tobias Geerinckx-Rice
8e16c57424
nox: show trace for evaluation errors
...
Backports upstream commit 8900531.
2015-07-03 04:52:06 +02:00
Tobias Geerinckx-Rice
1869f171fd
stress-ng: 0.04.07 -> 0.04.10
2015-07-03 04:08:49 +02:00
aszlig
b65d351c30
duperemove: Update from 0.09.beta2 to 0.09.4.
...
Also switches to fetchFromGitHub to remove the need to depend on Git for
fetching the source tarball.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2015-07-02 12:28:26 +02:00
Pascal Wittmann
f0c00accd4
crackxls: fix build
2015-07-02 00:17:58 +02:00
William A. Kennington III
7eae48871f
Merge branch 'master.upstream' into staging.upstream
2015-07-01 13:38:17 -07:00
Matthias Beyer
ab9e853801
cloc: 1.62 -> 1.64
2015-07-01 20:42:44 +02:00
Shea Levy
dd9530c819
Merge remote-tracking branch 'projectorhq/riemann-tools'
...
Add riemann-tools package and service
2015-07-01 08:45:33 -04:00
Shea Levy
145768bf9b
Unmaintain a bunch of packages
2015-07-01 08:11:05 -04:00
William A. Kennington III
612f0bdd67
Merge branch 'master.upstream' into staging.upstream
2015-06-30 23:58:07 -07:00
William A. Kennington III
ddf15bc78a
glusterfs: Propagate acl due to header references
2015-06-30 23:54:42 -07:00