aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* release-request-a2143a0f-bf92-4fa8-ad68-7346e7505126-for-git_oc-dr1-release-4...android-8.0.0_r34android-8.0.0_r33android-8.0.0_r27android-8.0.0_r26android-8.0.0_r25android-8.0.0_r24android-8.0.0_r23android-8.0.0_r22android-8.0.0_r21oreo-dr3-releaseoreo-dr2-releaseoreo-dr1-releaseandroid-build-team Robot2017-06-056-37/+37
|\
| * Merge "UPSTREAM: iptables: insist that the lock is held." am: c9c53dbd72 am: ...oreo-dr1-devLorenzo Colitti2017-06-016-37/+37
| |\
| | * Merge "UPSTREAM: iptables: insist that the lock is held." am: c9c53dbd72 am: ...Lorenzo Colitti2017-06-016-37/+37
| | |\
| | | * Merge "UPSTREAM: iptables: insist that the lock is held." am: c9c53dbd72Lorenzo Colitti2017-06-016-37/+37
| | | |\
| | | | * Merge "UPSTREAM: iptables: insist that the lock is held."Lorenzo Colitti2017-06-016-37/+37
| | | | |\
| | | | | * Merge "UPSTREAM: iptables: insist that the lock is held."Treehugger Robot2017-06-016-37/+37
| | | | | |\
| | | | | | * UPSTREAM: iptables: insist that the lock is held.Lorenzo Colitti2017-05-316-37/+37
| | | | | |/
| * | | | | Always build the iptables lock when building iptables. am: 957abd4643android-wear-8.0.0_r2android-wear-8.0.0_r1Lorenzo Colitti2017-04-050-0/+0
| |\| | | |
| | * | | | Always build the iptables lock when building iptables.Lorenzo Colitti2017-04-050-0/+0
| | |\ \ \ \
| | | * | | | Always build the iptables lock when building iptables.android-wear-o-preview-4android-wear-o-preview-3android-vts-8.0_r2android-vts-8.0_r1android-o-iot-preview-5oreo-devo-iot-preview-5Lorenzo Colitti2017-04-051-0/+4
| * | | | | | Merge "Always build the iptables lock when building iptables." am: bb975c0535...Lorenzo Colitti2017-04-051-0/+4
| |\| | | | | | | |/ / / / | |/| | | |
| | * | | | Merge "Always build the iptables lock when building iptables." am: bb975c0535...Lorenzo Colitti2017-04-051-0/+4
| |/| | | | | | |/ / /
| | * | | Merge "Always build the iptables lock when building iptables." am: bb975c0535Lorenzo Colitti2017-04-051-0/+4
| | |\| |
| | | * | Merge "Always build the iptables lock when building iptables."Lorenzo Colitti2017-04-051-0/+4
| | | |\|
| | | | * Merge "Always build the iptables lock when building iptables."Treehugger Robot2017-04-051-0/+4
| | | |/|
| | | | * Always build the iptables lock when building iptables.Lorenzo Colitti2017-04-051-0/+4
* | | | | Always build the iptables lock when building iptables.Lorenzo Colitti2017-04-051-0/+4
|/ / / /
* | | | Merge changes from topic 'iptables-1.6.1' am: c784fc47e6 am: ff45753ae3Lorenzo Colitti2017-03-24315-1919/+23599
|\| | |
| * | | Merge changes from topic 'iptables-1.6.1' am: c784fc47e6Lorenzo Colitti2017-03-24315-1919/+23599
| |\| |
| | * | Merge changes from topic 'iptables-1.6.1'Lorenzo Colitti2017-03-24315-1919/+23599
| | |\|
| | | * Merge changes from topic 'iptables-1.6.1'Lorenzo Colitti2017-03-24315-1919/+23599
| | | |\
| | | | * Android-specific changes for upgrade to iptables-1.6.1.Lorenzo Colitti2017-03-228-16/+30
| | | | * iptables-restore: support acquiring the lock.Lorenzo Colitti2017-03-226-33/+122
| | | | * iptables: remove duplicated argument parsing codeLorenzo Colitti2017-03-226-160/+95
| | | | * iptables: move XT_LOCK_NAME from CFLAGS to config.h.Lorenzo Colitti2017-03-222-2/+5
| | | | * iptables: set the path of the lock file via a configure option.Lorenzo Colitti2017-03-222-4/+8
| | | | * xshared: using the blocking file lock request when we wait indefinitelyLiping Zhang2017-03-221-11/+14
| | | | * xshared: do not lock again and again if "-w" option is not specifiedLiping Zhang2017-03-221-7/+4
| | | | * Update to iptables 1.6.1.Lorenzo Colitti2017-03-22308-1812/+23517
| | | | |\
| | | | | * iptables 1.6.1 releasePablo Neira Ayuso2017-01-161-1/+1
| | | | | * build: Fix two compile errors during out-of-tree buildKeno Fischer2017-01-162-2/+2
| | | | | * libxtables: xtables: Use getnameinfo()Shyam Saini2016-12-201-4/+11
| | | | | * libxtables: xtables: remove unnecessary debug codeShyam Saini2016-12-201-26/+3
| | | | | * iptables: on revision mismatch, do not call print/saveWillem de Bruijn2016-12-112-8/+28
| | | | | * extensions: libxt_bpf: support ebpf pinned objectsWillem de Bruijn2016-12-104-50/+216
| | | | | * extensions: LOG: add log flags translation to nftLiping Zhang2016-11-292-8/+52
| | | | | * tcp_xlate: Enclose LH flag values in parenthesesPhil Sutter2016-11-291-2/+2
| | | | | * xtables-translate: Fix chain type when translating nat tablePhil Sutter2016-11-291-6/+12
| | | | | * nft_ipv{4,6}_xlate: Respect prefix lengthsPhil Sutter2016-11-292-7/+11
| | | | | * xtables-translate: Support setting standard chain policyPhil Sutter2016-11-291-5/+11
| | | | | * extensions: libip6t_ah: Fix translation of plain '-m ah'Phil Sutter2016-11-291-1/+6
| | | | | * libxt_multiport: remove an unused variableGeorge Burgess IV2016-11-231-2/+0
| | | | | * configure: update libnetfilter_conntrack version dependencyPablo Neira Ayuso2016-11-101-1/+1
| | | | | * extensions: update Arturo Borrero email addressArturo Borrero Gonzalez2016-11-107-7/+7
| | | | | * extensions: libxt_mangle: Use getaddrinfo()Shivani Bhardwaj2016-11-101-10/+18
| | | | | * iptables: xtables-arp: Use getaddrinfo()Shivani Bhardwaj2016-11-101-10/+18
| | | | | * connlabel: clarify default config pathFlorian Westphal2016-10-181-2/+5
| | | | | * extensions: libxt_statistic: add translation to nftLiping Zhang2016-10-141-0/+21
| | | | | * extensions: libxt_DSCP: add translation to nftLiping Zhang2016-10-141-13/+51
| | | | | * extensions: libxt_quota: add translation to nftLiping Zhang2016-10-141-0/+12