Hi Folks

I have gotten at a point where I want to push my stuff.

@Yves could you have a look at my merge output to just _guess_ if it
looks OK

mega@luna:~/leaf/devel/leaf.new/bering-uclibc> git branch
  maint
  master
* nameif
mega@luna:~/leaf/devel/leaf.new/bering-uclibc> git checkout maint
M       conf/.gitignore
M       conf/buildtool.conf
Switched to branch "maint"
mega@luna:~/leaf/devel/leaf.new/bering-uclibc> git merge nameif
Auto-merged conf/sources.cfg
Merge made by recursive.
 conf/sources.cfg            |   11 ++++++
 repo/bbnameif/buildtool.cfg |   75
+++++++++++++++++++++++++++++++++++++++++++
 repo/bbnameif/buildtool.mk  |   31 ++++++++++++++++++
 repo/bbnameif/mactab        |    6 +++
 repo/bbnameif/mactab.tmp    |    8 ++++
 repo/bbnameif/nameif        |   38 ++++++++++++++++++++++
 repo/busybox/.config        |    4 +-
 7 files changed, 171 insertions(+), 2 deletions(-)
 create mode 100644 repo/bbnameif/buildtool.cfg
 create mode 100644 repo/bbnameif/buildtool.mk
 create mode 100644 repo/bbnameif/mactab
 create mode 100644 repo/bbnameif/mactab.tmp
 create mode 100644 repo/bbnameif/nameif

This is how the log looks

commit a9ab81c9ea572139a01649b33989ef0e2624497f
Merge: 5424f54... 4cbad44...
Author: mega <erich.t...@think.ch>
Date:   Fri Oct 5 19:02:13 2012 +0200

    Merge branch 'nameif' into maint

commit 4cbad44466ba316b7cbcec3d9912dc1f3fe94896
Author: mega <erich.t...@think.ch>
Date:   Fri Oct 5 16:27:58 2012 +0200

    Small fix on the nameif start script

commit 0f2d204322e95c57f87c1fab560ed74103c684b5
Author: mega <erich.t...@think.ch>
Date:   Fri Oct 5 14:46:30 2012 +0200

    Added a little bit of comment to the mactab files

commit 18100f0ae798d18eb0b65f40640a03b2e8f3feb8
Author: mega <erich.t...@think.ch>
Date:   Fri Oct 5 14:37:21 2012 +0200

    Added new code to enable and use the Busybox nameif applet
    which enables control for network interface naming

commit 9b048d4d36d7bff3fdfbb93808a83122ce83f579
Author: mega <m...@luna.think.ch>
Date:   Wed Oct 3 13:31:58 2012 +0200

    enabled nameif applet

commit 5424f54d3e8752243dacccfbe670486c44fb8d46
Author: kapeka <kap...@users.sourceforge.net>
Date:   Thu Sep 27 20:44:31 2012 +0200

    squid depends on openssl

.....

Thanks

Erich

Attachment: smime.p7s
Description: S/MIME Kryptografische Unterschrift

------------------------------------------------------------------------------
Don't let slow site performance ruin your business. Deploy New Relic APM
Deploy New Relic app performance management and know exactly
what is happening inside your Ruby, Python, PHP, Java, and .NET app
Try New Relic at no cost today and get our sweet Data Nerd shirt too!
http://p.sf.net/sfu/newrelic-dev2dev
_______________________________________________
leaf-devel mailing list
leaf-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/leaf-devel

Reply via email to