Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into monit
authorDirk Wagner <dirk.wagner@ipfire.org>
Tue, 6 Jan 2015 14:51:29 +0000 (15:51 +0100)
committerDirk Wagner <dirk.wagner@ipfire.org>
Tue, 6 Jan 2015 14:51:29 +0000 (15:51 +0100)
Conflicts:
config/etc/logrotate.conf

1  2 
config/rootfiles/common/armv5tel/initscripts
config/rootfiles/common/i586/initscripts
lfs/initscripts
make.sh

index c761e26,9804415..e529e66
mode 100755,100644..100755
@@@ -53,9 -52,9 +52,10 @@@ etc/rc.d/init.d/mISD
  #etc/rc.d/init.d/mldonkey
  etc/rc.d/init.d/modules
  #etc/rc.d/init.d/motion
 +#etc/rc.d/init.d/monit
  etc/rc.d/init.d/mountfs
  etc/rc.d/init.d/mountkernfs
+ etc/rc.d/init.d/mounttmpfs
  #etc/rc.d/init.d/mpd
  #etc/rc.d/init.d/mysql
  #etc/rc.d/init.d/netsnmpd
diff --cc lfs/initscripts
index 4acf65e,4894710..4894710
mode 100755,100644..100755
diff --cc make.sh
Simple merge