Re: [asterisk-dev] [Code Review] 4613: clang compiler warning: clang compilation

[Matt Jordan]

---
This is an automatically generated e-mail. To reply, visit:
https://reviewboard.asterisk.org/r/4613/#review15197
---


Over the past week, Asterisk has moved to Git. The migration was announced and 
discussed on the asterisk-dev list.

We are now using Gerrit for code reviews (gerrit.asterisk.org). You can find 
instructions for using Gerrit on the Asterisk wiki:

https://wiki.asterisk.org/wiki/display/AST/Gerrit+Usage

Information about the Git servers and other policies can be found here:

https://wiki.asterisk.org/wiki/display/AST/Git+Usage

While it's a bit of a pain to move the patch over, in the long run, this should 
make managing the clang fixup patches much easier.

- Matt Jordan


On April 20, 2015, 5:38 a.m., Diederik de Groot wrote:
> 
> ---
> This is an automatically generated e-mail. To reply, visit:
> https://reviewboard.asterisk.org/r/4613/
> ---
> 
> (Updated April 20, 2015, 5:38 a.m.)
> 
> 
> Review request for Asterisk Developers, Matt Jordan, Mark Michelson, and 
> rmudgett.
> 
> 
> Bugs: ASTERISK-24917
> https://issues.asterisk.org/jira/browse/ASTERISK-24917
> 
> 
> Repository: Asterisk
> 
> 
> Description
> ---
> 
> clang compilation.
> 
> three warnings have been suppressed (in Makefile.rules), which were deemed 
> unsuitable for asterisk:
> - unused-value 
> - parentheses-equality 
> - unused-command-line-argument
> 
> changes can/could be ported back to asterisk-11 if required.
> 
> 
> Diffs
> -
> 
>   /branches/13/res/res_security_log.c 434725 
>   /branches/13/makeopts.in 434725 
>   /branches/13/main/security_events.c 434725 
>   /branches/13/include/asterisk/utils.h 434725 
>   /branches/13/include/asterisk/autoconfig.h.in 434725 
>   /branches/13/contrib/scripts/clang-scan-build PRE-CREATION 
>   /branches/13/configure.ac 434725 
>   /branches/13/configure UNKNOWN 
>   /branches/13/channels/chan_skinny.c 434725 
>   /branches/13/autoconf/ast_check_strsep_array_bounds.m4 PRE-CREATION 
>   /branches/13/autoconf/ast_check_raii.m4 PRE-CREATION 
>   /branches/13/Makefile.rules 434725 
> 
> Diff: https://reviewboard.asterisk.org/r/4613/diff/
> 
> 
> Testing
> ---
> 
> compiles cleanly
> 
> test execute all 
> 455 Test(s) Executed  454 Passed  1 Failed
> 
> FAIL   test_message_queue_handler_nom /main/message/ 21200ms
> =
> START  /main/message/ - test_message_queue_handler_nominal 
> [test_message.c:int handler_wait_for_message(struct ast_test *):244]: Test 
> timed out while waiting for handler to get message
> END/main/message/ - test_message_queue_handler_nominal Time: 21241ms 
> Result: FAIL
> =
> 1 Test(s) Executed  0 Passed  1 Failed
>   == Message handler 'testmsg' registered.
> -- Executing [s@default:1] wait("Message/ast_msg_queue", "1")
> -- Executing [s@default:1] answer("Message/ast_msg_queue", "")
> -- Digit timeout set to 5.000
> -- Response timeout set to 10.000
> 
> 
> -- Executing [s@default:1] background("Message/ast_msg_queue", 
> "demo-congrats")
> [Apr 18 15:22:50] ERROR[13650][C-]: channel.c:5423 int 
> set_format(struct ast_channel *, struct ast_format_cap *, const int): Unable 
> to set format because channel Message/ast_msg_queue supports no formats
> [Apr 18 15:22:50] WARNING[13650][C-]: file.c:1100 int 
> ast_streamfile(struct ast_channel *, const char *, const char *): Unable to 
> open demo-congrats (format (none)): Function not implemented
> [Apr 18 15:22:50] WARNING[13650][C-]: pbx.c:11319 int 
> pbx_builtin_background(struct ast_channel *, const char *): ast_streamfile 
> failed on Message/ast_msg_queue for demo-congrats
>  Repeated
> 
> 
> Thanks,
> 
> Diederik de Groot
> 
>

-- 
_
-- Bandwidth and Colocation Provided by http://www.api-digital.com --

asterisk-dev mailing list
To UNSUBSCRIBE or update options visit:
   http://lists.digium.com/mailman/listinfo/asterisk-dev

[asterisk-dev] Change in testsuite[master]: pjsip: Add basic resolver tests covering A/AAAA, SRV, and NA...

[Matt Jordan (Code Review)]

Matt Jordan has posted comments on this change.

Change subject: pjsip: Add basic resolver tests covering A/, SRV, and NAPTR.
..


Patch Set 2: Code-Review+1

-- 
To view, visit https://gerrit.asterisk.org/31
To unsubscribe, visit https://gerrit.asterisk.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I8690d6b2441937ab9d7fea6f1e41c3d6985a1d9e
Gerrit-PatchSet: 2
Gerrit-Project: testsuite
Gerrit-Branch: master
Gerrit-Owner: Joshua Colp 
Gerrit-Reviewer: Jared K. Smith 
Gerrit-Reviewer: Matt Jordan 
Gerrit-HasComments: No

-- 
_
-- Bandwidth and Colocation Provided by http://www.api-digital.com --

asterisk-dev mailing list
To UNSUBSCRIBE or update options visit:
   http://lists.digium.com/mailman/listinfo/asterisk-dev

[asterisk-dev] Change in testsuite[master]: python/asterisk/version: Update version handling for Git mig...

[Matt Jordan (Code Review)]

Matt Jordan has submitted this change and it was merged.

Change subject: python/asterisk/version: Update version handling for Git 
migration
..


python/asterisk/version: Update version handling for Git migration

This patch updates the Asterisk version parsing module to handle
versions derived from a Git repository. It leaves SVN and tag version
parsing alone.

All Git versions are assumed to be in the following form:
  Asterisk GIT-{branch}-{obj_blob}
Where branch must be 'master' or one of the canonical mainline branches.

Since the version tag no longer reflects individual team or local
branches, this makes it far easier to map a team/local branch to an
upstream Asterisk version.

ASTERISK-24954

Change-Id: Idbb0ef92fec6d4e8e39da105c9c635f9ecdd4ee4
---
M lib/python/asterisk/version.py
1 file changed, 215 insertions(+), 81 deletions(-)

Approvals:
  Matt Jordan: Looks good to me, approved; Verified
  George Joseph: Looks good to me, but someone else must approve



diff --git a/lib/python/asterisk/version.py b/lib/python/asterisk/version.py
index 4432cf2..520f5a0 100644
--- a/lib/python/asterisk/version.py
+++ b/lib/python/asterisk/version.py
@@ -23,8 +23,8 @@
 LOGGER = logging.getLogger(__name__)
 
 
-def parse_branch_name(branch_tokens):
-"""Parse an Asterisk branch version"""
+def parse_svn_branch_name(branch_tokens):
+"""Parse an Asterisk SVN branch version"""
 name = branch_tokens[0]
 munched = 0
 for i in range(1, len(branch_tokens)):
@@ -95,66 +95,29 @@
 return (parent_branch, True)
 
 
-def parse_version_string(raw_version):
-"""Parse a raw version string into its parts"""
-branch = False
-svn = False
-feature = ''
-parsed_numbers = [0, 0, 0]
-name = ''
-revision = 0
-parent = ''
-iteration = 0
-modifier = ''
-
-raw_version = raw_version.replace('Asterisk ', '')
-
-tokens = re.split('[-~]', raw_version)
-count = 0
-while (count < len(tokens)):
-token = tokens[count]
-# Determine if we're a subversion branch
-if 'SVN' == token:
-svn = True
-elif 'branch' == token:
-branch = True
-else:
-if svn and not branch and not name:
-# Team branch or trunk.  This will modify the current
-# position based on the number of tokens consumed
-(name, munched) = parse_branch_name(tokens[count:])
-count += munched
-else:
-handled = False
-if (len([num for num in parsed_numbers if num != 0]) == 0):
-(parsed_numbers, handled) = parse_version(token)
-if not handled and revision == 0:
-(revision, handled) = parse_revision(token)
-if not handled and not feature:
-# If a feature returns back a number, its actually the
-# 'patch' version number (e.g., 1.8.11-cert3)
-(feature, temp, handled) = parse_feature(token)
-if (temp > 0):
-parsed_numbers[2] = temp
-if not handled and not modifier:
-(modifier,
- iteration,
- handled) = parse_version_modifier(token)
-if not handled and not parent:
-(parent, handled) = parse_parent_branch(token)
-if not handled:
-LOGGER.error("Unable to parse token '%s' in version "
- "string '%s'" % (token, raw_version))
-count += 1
-return (parsed_numbers[0], parsed_numbers[1], parsed_numbers[2],
-iteration, revision, branch, svn, name, feature, modifier,
-parent)
-
-
 class AsteriskVersion(object):
 """An Asterisk Version.
 
 This class handles Asterisk version strings.
+
+Attributes:
+raw_version - The pre-parsed version string
+branch  - If true, this is a branch and not a tag. Note that
+  if svn is True, then this implies that we think this
+  must be 'trunk'. This is always True if git is True.
+svn - The Asterisk version is derived from Subversion
+git - The Asterisk version is derived from Git
+major   - The major version number
+minor   - The minor version number
+patch   - The patch version number
+feature - Asterisk specific branch/tag features, e.g., 'cert'
+modifier- Asterisk tag release modifiers, e.g., 'rc'
+iteration   - Iteration of the modifier, e.g., 1 for 

[asterisk-dev] Change in testsuite[master]: python/asterisk/version: Update version handling for Git mig...

[Matt Jordan (Code Review)]

Matt Jordan has posted comments on this change.

Change subject: python/asterisk/version: Update version handling for Git 
migration
..


Patch Set 3: Code-Review+2 Verified+1

-- 
To view, visit https://gerrit.asterisk.org/91
To unsubscribe, visit https://gerrit.asterisk.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: Idbb0ef92fec6d4e8e39da105c9c635f9ecdd4ee4
Gerrit-PatchSet: 3
Gerrit-Project: testsuite
Gerrit-Branch: master
Gerrit-Owner: Matt Jordan 
Gerrit-Reviewer: George Joseph 
Gerrit-Reviewer: Matt Jordan 
Gerrit-HasComments: No

-- 
_
-- Bandwidth and Colocation Provided by http://www.api-digital.com --

asterisk-dev mailing list
To UNSUBSCRIBE or update options visit:
   http://lists.digium.com/mailman/listinfo/asterisk-dev

Re: [asterisk-dev] [Code Review] 4391: Add blank line between headers and output for Command action response

[Matt Jordan]

> On April 13, 2015, 2:41 a.m., Corey Farrell wrote:
> > So I think this looks pretty good.  Next steps:
> > * We've migrated to git.  Take a look at [1] for information on how to use 
> > gerrit to post a git review.  Don't worry you won't be facing the full 
> > review again, we've already dealt with the code issues.
> > * We need to prepare a patch for starpy [2].  I don't have time to work on 
> > this right now.  Do you know python or know someone who does and has 
> > time/willingness to help?
> > * Verify the full testsuite passes against the latest Asterisk with this 
> > change.
> > * Once starpy supports the change we will coordinate with Digium to ensure 
> > starpy is updated before we commit this to trunk.
> > 
> > I know this seems like a lot, but we are changing the protocol, so we need 
> > to make sure we do not break the testsuite.
> > 
> > [1] https://wiki.asterisk.org/wiki/display/AST/Gerrit+Usage
> > [2] https://github.com/asterisk/starpy/

I'd be willing to take on the starpy issues if/when this gets pulled over.


- Matt


---
This is an automatically generated e-mail. To reply, visit:
https://reviewboard.asterisk.org/r/4391/#review15190
---


On April 13, 2015, midnight, gareth wrote:
> 
> ---
> This is an automatically generated e-mail. To reply, visit:
> https://reviewboard.asterisk.org/r/4391/
> ---
> 
> (Updated April 13, 2015, midnight)
> 
> 
> Review request for Asterisk Developers.
> 
> 
> Bugs: ASTERISK-24730
> https://issues.asterisk.org/jira/browse/ASTERISK-24730
> 
> 
> Repository: Asterisk
> 
> 
> Description
> ---
> 
> This patch adds a blank line between the headers and the output in the 
> Command action response. The reason for this change is to make it easier to 
> determine where the headers end and the output from the command starts.
> 
> Currently, to parse a response to a Command action, one has to:
> 
> 1. Read one line, if line is "Response: Error", parse the remaining as a 
> standard AMI response and stop.
> 2. Read one more line - or two if you used an ActionID - those lines are the 
> headers.
> 3. Then read everything up to "--END COMMAND--\r\n\r\n".
> 
> That could be changed to:
> 
> 1. Read standard AMI response.
> 2. If "Response: Follows", then read everything up to "--END 
> COMMAND--\r\n\r\n".
> 
> The AMI version has been increased to 2.8.0 as this is a protocol change and 
> so that clients detect the new behavior.
> 
> Adding a blank line should not cause older parsers to fail as they have to 
> read everything up to "--END COMMAND--\r\n\r\n" anyway.
> 
> Adding a blank line will also not cause the AMI to HTML/XML encoder to fail 
> to separate the headers from the output as it checks for the presence of a 
> ":" character, which a blank line does not contain.
> 
> 
> Diffs
> -
> 
>   /trunk/main/manager.c 434448 
>   /trunk/main/cli.c 434448 
>   /trunk/include/asterisk/manager.h 434448 
>   /trunk/UPGRADE.txt 434448 
> 
> Diff: https://reviewboard.asterisk.org/r/4391/diff/
> 
> 
> Testing
> ---
> 
> Connected to manager, issued 'core show uptime' command and verified that 
> there was a blank line between the headers and output.
> 
> 
> Thanks,
> 
> gareth
> 
>

-- 
_
-- Bandwidth and Colocation Provided by http://www.api-digital.com --

asterisk-dev mailing list
To UNSUBSCRIBE or update options visit:
   http://lists.digium.com/mailman/listinfo/asterisk-dev

Re: [asterisk-dev] [Code Review] 4612: Command "cdr show pgsql status" dont work

[Matt Jordan]

---
This is an automatically generated e-mail. To reply, visit:
https://reviewboard.asterisk.org/r/4612/#review15193
---


The Asterisk project has migrated to Gerrit. Reviews on Review Board should be 
moved to Gerrit:

https://gerrit.asterisk.org

Please see the instructions on using Gerrit here:

https://wiki.asterisk.org/wiki/display/AST/Gerrit+Usage

- Matt Jordan


On April 13, 2015, 4:23 p.m., Rodrigo Ramirez Norambuena wrote:
> 
> ---
> This is an automatically generated e-mail. To reply, visit:
> https://reviewboard.asterisk.org/r/4612/
> ---
> 
> (Updated April 13, 2015, 4:23 p.m.)
> 
> 
> Review request for Asterisk Developers.
> 
> 
> Bugs: https://issues.asterisk.org/jira/browse/ASTERISK-24959
> 
> https://issues.asterisk.org/jira/browse/https://issues.asterisk.org/jira/browse/ASTERISK-24959
> 
> 
> Repository: Asterisk
> 
> 
> Description
> ---
> 
> The command on cli "cdr show pgsql status" ever show usage option
> 
> "Usage: cdr show pgsql status
>Shows current connection status for cdr_pgsql"
> 
> 
> Diffs
> -
> 
>   /trunk/cdr/cdr_pgsql.c 434725 
> 
> Diff: https://reviewboard.asterisk.org/r/4612/diff/
> 
> 
> Testing
> ---
> 
> 
> Thanks,
> 
> Rodrigo Ramirez Norambuena
> 
>

-- 
_
-- Bandwidth and Colocation Provided by http://www.api-digital.com --

asterisk-dev mailing list
To UNSUBSCRIBE or update options visit:
   http://lists.digium.com/mailman/listinfo/asterisk-dev

[asterisk-dev] Change in testsuite[master]: tests/channels/pjsip/config_wizard/hints: Add 'has_hint' var...

[Matt Jordan (Code Review)]

Matt Jordan has submitted this change and it was merged.

Change subject: tests/channels/pjsip/config_wizard/hints: Add 'has_hint' 
variable
..


tests/channels/pjsip/config_wizard/hints: Add 'has_hint' variable

The pjsip_wizard.conf file was missing the 'has_hint' variable that
actually turns on the hint processing.  This was resulting in test
failure.

Change-Id: I778143aac1666010cb247f6f76d3be6fb64bb901
---
M tests/channels/pjsip/config_wizard/hints/configs/ast1/pjsip_wizard.conf
1 file changed, 1 insertion(+), 0 deletions(-)

Approvals:
  Matt Jordan: Looks good to me, approved; Verified
  Joshua Colp: Looks good to me, but someone else must approve



diff --git 
a/tests/channels/pjsip/config_wizard/hints/configs/ast1/pjsip_wizard.conf 
b/tests/channels/pjsip/config_wizard/hints/configs/ast1/pjsip_wizard.conf
index 96b72d8..f9d25e6 100644
--- a/tests/channels/pjsip/config_wizard/hints/configs/ast1/pjsip_wizard.conf
+++ b/tests/channels/pjsip/config_wizard/hints/configs/ast1/pjsip_wizard.conf
@@ -8,6 +8,7 @@
 inbound_auth/username = testuser
 inbound_auth/password = testpass
 endpoint/direct_media = no
+has_hint = yes
 hint_context = default_hints
 hint_exten = 9090
 hint_application = Dial(${HINT}/)

-- 
To view, visit https://gerrit.asterisk.org/41
To unsubscribe, visit https://gerrit.asterisk.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I778143aac1666010cb247f6f76d3be6fb64bb901
Gerrit-PatchSet: 1
Gerrit-Project: testsuite
Gerrit-Branch: master
Gerrit-Owner: George Joseph 
Gerrit-Reviewer: Joshua Colp 
Gerrit-Reviewer: Matt Jordan 

-- 
_
-- Bandwidth and Colocation Provided by http://www.api-digital.com --

asterisk-dev mailing list
To UNSUBSCRIBE or update options visit:
   http://lists.digium.com/mailman/listinfo/asterisk-dev

[asterisk-dev] Change in testsuite[master]: python/asterisk/version: Update version handling for Git mig...

[Matt Jordan (Code Review)]

Matt Jordan has uploaded a new patch set (#3).

Change subject: python/asterisk/version: Update version handling for Git 
migration
..

python/asterisk/version: Update version handling for Git migration

This patch updates the Asterisk version parsing module to handle
versions derived from a Git repository. It leaves SVN and tag version
parsing alone.

All Git versions are assumed to be in the following form:
  Asterisk GIT-{branch}-{obj_blob}
Where branch must be 'master' or one of the canonical mainline branches.

Since the version tag no longer reflects individual team or local
branches, this makes it far easier to map a team/local branch to an
upstream Asterisk version.

ASTERISK-24954

Change-Id: Idbb0ef92fec6d4e8e39da105c9c635f9ecdd4ee4
---
M lib/python/asterisk/version.py
1 file changed, 215 insertions(+), 81 deletions(-)


  git pull ssh://gerrit.asterisk.org:29418/testsuite refs/changes/91/91/3
-- 
To view, visit https://gerrit.asterisk.org/91
To unsubscribe, visit https://gerrit.asterisk.org/settings

Gerrit-MessageType: newpatchset
Gerrit-Change-Id: Idbb0ef92fec6d4e8e39da105c9c635f9ecdd4ee4
Gerrit-PatchSet: 3
Gerrit-Project: testsuite
Gerrit-Branch: master
Gerrit-Owner: Matt Jordan 

-- 
_
-- Bandwidth and Colocation Provided by http://www.api-digital.com --

asterisk-dev mailing list
To UNSUBSCRIBE or update options visit:
   http://lists.digium.com/mailman/listinfo/asterisk-dev

[asterisk-dev] Change in testsuite[master]: PEP8 fixes

[Matt Jordan (Code Review)]

Matt Jordan has posted comments on this change.

Change subject: PEP8 fixes
..


Patch Set 2: Code-Review+2 Verified+1

-- 
To view, visit https://gerrit.asterisk.org/40
To unsubscribe, visit https://gerrit.asterisk.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I55bcaab21c54f9040594f51c57f0efe30a219a62
Gerrit-PatchSet: 2
Gerrit-Project: testsuite
Gerrit-Branch: master
Gerrit-Owner: Corey Farrell 
Gerrit-Reviewer: Corey Farrell 
Gerrit-Reviewer: George Joseph 
Gerrit-Reviewer: Matt Jordan 
Gerrit-HasComments: No

-- 
_
-- Bandwidth and Colocation Provided by http://www.api-digital.com --

asterisk-dev mailing list
To UNSUBSCRIBE or update options visit:
   http://lists.digium.com/mailman/listinfo/asterisk-dev

[asterisk-dev] Change in testsuite[master]: PEP8 fixes

[Matt Jordan (Code Review)]

Matt Jordan has submitted this change and it was merged.

Change subject: PEP8 fixes
..


PEP8 fixes

* Add tox.ini for pep8 to set max-line-length=90
* Resolve most PEP8 findings in runtests.py and lib.

Change-Id: I55bcaab21c54f9040594f51c57f0efe30a219a62
---
M lib/python/asterisk/ami.py
M lib/python/asterisk/apptest.py
M lib/python/asterisk/ari.py
M lib/python/asterisk/astcsv.py
M lib/python/asterisk/asterisk.py
M lib/python/asterisk/bridge_test_case.py
M lib/python/asterisk/buildoptions.py
M lib/python/asterisk/cdr.py
M lib/python/asterisk/cel.py
M lib/python/asterisk/confbridge.py
M lib/python/asterisk/config.py
M lib/python/asterisk/dns_server.py
M lib/python/asterisk/fd_test_condition.py
M lib/python/asterisk/lock_test_condition.py
M lib/python/asterisk/pcap.py
M lib/python/asterisk/phones.py
M lib/python/asterisk/pjsua_mod.py
M lib/python/asterisk/pluggable_modules.py
M lib/python/asterisk/pluggable_registry.py
M lib/python/asterisk/sip_channel_test_condition.py
M lib/python/asterisk/sip_dialog_test_condition.py
M lib/python/asterisk/sipp.py
M lib/python/asterisk/sippversion.py
M lib/python/asterisk/syncami.py
M lib/python/asterisk/test_case.py
M lib/python/asterisk/test_conditions.py
M lib/python/asterisk/test_config.py
M lib/python/asterisk/test_runner.py
M lib/python/asterisk/test_state.py
M lib/python/asterisk/test_suite_utils.py
M lib/python/asterisk/thread_test_condition.py
M lib/python/asterisk/version.py
M lib/python/asterisk/voicemail.py
M lib/python/pcap_listener.py
M lib/python/qm.py
M lib/python/rlmi.py
M lib/python/sip_message.py
M runtests.py
A tox.ini
39 files changed, 596 insertions(+), 516 deletions(-)

Approvals:
  Matt Jordan: Looks good to me, approved; Verified
  George Joseph: Looks good to me, but someone else must approve



diff --git a/lib/python/asterisk/ami.py b/lib/python/asterisk/ami.py
index 1dd5221..3cbeeaf 100644
--- a/lib/python/asterisk/ami.py
+++ b/lib/python/asterisk/ami.py
@@ -14,9 +14,10 @@
 import re
 import json
 from pluggable_registry import PLUGGABLE_EVENT_REGISTRY,\
-   PLUGGABLE_ACTION_REGISTRY, var_replace
+PLUGGABLE_ACTION_REGISTRY, var_replace
 
 LOGGER = logging.getLogger(__name__)
+
 
 class AMIEventInstance(object):
 """Base class for specific instances of AMI event observers
@@ -37,10 +38,8 @@
 conditions = instance_config['conditions']
 self.match_conditions = conditions['match']
 self.nonmatch_conditions = conditions.get('nomatch', {})
-self.ids = instance_config['id'].split(',') if 'id' in instance_config\
-   else ['0']
-self.action = instance_config['action'] if 'action' in instance_config\
-else 'none'
+self.ids = instance_config['id'].split(',') if 'id' in instance_config 
else ['0']
+self.action = instance_config['action'] if 'action' in instance_config 
else 'none'
 self.config = instance_config
 self.passed = True
 self._registered = False
@@ -75,7 +74,7 @@
 # test's yaml then create the dict with setting the Event to 'CEL'.
 # Otherwise set Event to 'CEL' since it's the only Event we want.
 if instance_config['conditions']['match'] is None:
-instance_config['conditions']['match'] = {'Event' : 'CEL'}
+instance_config['conditions']['match'] = {'Event': 'CEL'}
 self.match_conditions = instance_config['conditions']['match']
 else:
 instance_config['conditions']['match']['Event'] = 'CEL'
@@ -118,7 +117,7 @@
 def dispose(self, ami):
 """Dispose of this object's AMI event registrations"""
 if str(ami.id) not in self.ids:
-LOGGER.warning("Unable to dispose of AMIEventInstance - " \
+LOGGER.warning("Unable to dispose of AMIEventInstance - "
"unknown AMI object %d", ami.id)
 return
 ami.deregisterEvent(self.match_conditions['Event'],
@@ -209,9 +208,9 @@
 LOGGER.debug("Initializing an AMIHeaderMatchInstance")
 if 'requirements' in instance_config:
 self.match_requirements =\
-instance_config['requirements'].get('match', {})
+instance_config['requirements'].get('match', {})
 self.nonmatch_requirements =\
-instance_config['requirements']

[asterisk-dev] Change in testsuite[master]: tests/channels/pjsip/config_wizard/hints: Add 'has_hint' var...

[Matt Jordan (Code Review)]

Matt Jordan has posted comments on this change.

Change subject: tests/channels/pjsip/config_wizard/hints: Add 'has_hint' 
variable
..


Patch Set 1: Code-Review+2 Verified+1

-- 
To view, visit https://gerrit.asterisk.org/41
To unsubscribe, visit https://gerrit.asterisk.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I778143aac1666010cb247f6f76d3be6fb64bb901
Gerrit-PatchSet: 1
Gerrit-Project: testsuite
Gerrit-Branch: master
Gerrit-Owner: George Joseph 
Gerrit-Reviewer: Joshua Colp 
Gerrit-Reviewer: Matt Jordan 
Gerrit-HasComments: No

-- 
_
-- Bandwidth and Colocation Provided by http://www.api-digital.com --

asterisk-dev mailing list
To UNSUBSCRIBE or update options visit:
   http://lists.digium.com/mailman/listinfo/asterisk-dev

[asterisk-dev] Change in testsuite[master]: python/asterisk/version: Update version handling for Git mig...

[Matt Jordan (Code Review)]

Matt Jordan has uploaded a new patch set (#2).

Change subject: python/asterisk/version: Update version handling for Git 
migration
..

python/asterisk/version: Update version handling for Git migration

This patch updates the Asterisk version parsing module to handle
versions derived from a Git repository. It leaves SVN and tag version
parsing alone.

All Git versions are assumed to be in the following form:
  Asterisk GIT-{branch}-{obj_blob}
Where branch must be 'master' or one of the canonical mainline branches.

Since the version tag no longer reflects individual team or local
branches, this makes it far easier to map a team/local branch to an
upstream Asterisk version.

ASTERISK-24954

Change-Id: Idbb0ef92fec6d4e8e39da105c9c635f9ecdd4ee4
---
M lib/python/asterisk/version.py
1 file changed, 228 insertions(+), 86 deletions(-)


  git pull ssh://gerrit.asterisk.org:29418/testsuite refs/changes/91/91/2
-- 
To view, visit https://gerrit.asterisk.org/91
To unsubscribe, visit https://gerrit.asterisk.org/settings

Gerrit-MessageType: newpatchset
Gerrit-Change-Id: Idbb0ef92fec6d4e8e39da105c9c635f9ecdd4ee4
Gerrit-PatchSet: 2
Gerrit-Project: testsuite
Gerrit-Branch: master
Gerrit-Owner: Matt Jordan 

-- 
_
-- Bandwidth and Colocation Provided by http://www.api-digital.com --

asterisk-dev mailing list
To UNSUBSCRIBE or update options visit:
   http://lists.digium.com/mailman/listinfo/asterisk-dev

[asterisk-dev] Change in testsuite[master]: python/asterisk/version: Update version handling for Git mig...

[Matt Jordan (Code Review)]

Matt Jordan has uploaded a new change for review.

  https://gerrit.asterisk.org/91

Change subject: python/asterisk/version: Update version handling for Git 
migration
..

python/asterisk/version: Update version handling for Git migration

This patch updates the Asterisk version parsing module to handle
versions derived from a Git repository. It leaves SVN and tag version
parsing alone.

All Git versions are assumed to be in the following form:
  Asterisk GIT-{branch}-{obj_blob}
Where branch must be 'master' or one of the canonical mainline branches.

Since the version tag no longer reflects individual team or local
branches, this makes it far easier to map a team/local branch to an
upstream Asterisk version.

ASTERISK-24954

Change-Id: Idbb0ef92fec6d4e8e39da105c9c635f9ecdd4ee4
---
M lib/python/asterisk/version.py
1 file changed, 246 insertions(+), 86 deletions(-)


  git pull ssh://gerrit.asterisk.org:29418/testsuite refs/changes/91/91/1

diff --git a/lib/python/asterisk/version.py b/lib/python/asterisk/version.py
index 3b7bf5b..b2ccfbe 100644
--- a/lib/python/asterisk/version.py
+++ b/lib/python/asterisk/version.py
@@ -22,20 +22,40 @@
 
 LOGGER = logging.getLogger(__name__)
 
-def parse_branch_name(branch_tokens):
-"""Parse an Asterisk branch version"""
+
+def parse_svn_branch_name(branch_tokens):
+"""Parse an Asterisk SVN branch version"""
 name = branch_tokens[0]
 munched = 0
 for i in range(1, len(branch_tokens)):
 # Stop when we hit the revision
 if branch_tokens[i][0] == 'r':
-candidate = branch_tokens[i].replace('r','')
-candidate = candidate.replace('M','').replace('m','')
+candidate = branch_tokens[i].replace('r', '')
+candidate = candidate.replace('M', '').replace('m', '')
 if candidate.isdigit():
 break
 name += '-' + branch_tokens[i]
 munched += 1
 return (name, munched)
+
+
+def parse_git_branch_name(branch_tokens):
+"""Parse an Asterisk GIT branch version"""
+name = branch_tokens[0]
+munched = 0
+print name
+return (name, 0, 0, 0, munched)
+for i in range(1, len(branch_tokens)):
+# Stop when we hit the revision
+if branch_tokens[i][0] == 'r':
+candidate = branch_tokens[i].replace('r', '')
+candidate = candidate.replace('M', '').replace('m', '')
+if candidate.isdigit():
+break
+name += '-' + branch_tokens[i]
+munched += 1
+return (name, munched)
+
 
 def parse_version(version_string):
 """Parse a 'standard' Asterisk version"""
@@ -52,13 +72,15 @@
 count += 1
 return (parsed_numbers, True)
 
+
 def parse_revision(revision_string):
 """Parse a modified version of Asterisk"""
 candidate = revision_string.replace('M', '')
-candidate = candidate.replace('r','').replace('m','')
+candidate = candidate.replace('r', '').replace('m', '')
 if candidate.isdigit():
 return (int(candidate), True)
 return (0, False)
+
 
 def parse_feature(feature_string):
 """Parse a feature from a version"""
@@ -71,6 +93,7 @@
 return (feature, iteration, True)
 return ('', -1, False)
 
+
 def parse_version_modifier(version_modifier):
 """Parse a version modifier"""
 for modifier in AsteriskVersion.supported_modifiers:
@@ -82,77 +105,42 @@
 return (modifier, iteration, True)
 return ('', -1, False)
 
+
 def parse_parent_branch(parent_branch):
 """Parse a parent branch out of a version branch"""
 # Parent branch can be just about anything, so just accept it.
 # This should be the last thing called.
 return (parent_branch, True)
 
-def parse_version_string(raw_version):
-"""Parse a raw version string into its parts"""
-branch = False
-svn = False
-feature = ''
-parsed_numbers = [0, 0, 0]
-name = ''
-revision = 0
-parent = ''
-iteration = 0
-modifier = ''
-
-raw_version = raw_version.replace('Asterisk ', '')
-
-tokens = re.split('[-~]', raw_version)
-count = 0
-while (count < len(tokens)):
-token = tokens[count]
-# Determine if we're a subvers

[asterisk-dev] Change in asterisk[1.8]: main/editline: Add .gitignore.

[Matt Jordan (Code Review)]

Matt Jordan has posted comments on this change.

Change subject: main/editline: Add .gitignore.
..


Patch Set 1: Code-Review+1

-- 
To view, visit https://gerrit.asterisk.org/84
To unsubscribe, visit https://gerrit.asterisk.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I68c7bf375ea46282689e5a706534b69fca233b5d
Gerrit-PatchSet: 1
Gerrit-Project: asterisk
Gerrit-Branch: 1.8
Gerrit-Owner: George Joseph 
Gerrit-Reviewer: Corey Farrell 
Gerrit-Reviewer: Matt Jordan 
Gerrit-HasComments: No

-- 
_
-- Bandwidth and Colocation Provided by http://www.api-digital.com --

asterisk-dev mailing list
To UNSUBSCRIBE or update options visit:
   http://lists.digium.com/mailman/listinfo/asterisk-dev

[asterisk-dev] Change in asterisk[1.8]: .gitignore: Ignore tarballs (*.gz)

[Matt Jordan (Code Review)]

Matt Jordan has posted comments on this change.

Change subject: .gitignore: Ignore tarballs (*.gz)
..


Patch Set 1: Code-Review+1

-- 
To view, visit https://gerrit.asterisk.org/86
To unsubscribe, visit https://gerrit.asterisk.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: Ie84f085cc0fa51262209e7bfc1b1ba8c04a1ef59
Gerrit-PatchSet: 1
Gerrit-Project: asterisk
Gerrit-Branch: 1.8
Gerrit-Owner: George Joseph 
Gerrit-Reviewer: Matt Jordan 
Gerrit-HasComments: No

-- 
_
-- Bandwidth and Colocation Provided by http://www.api-digital.com --

asterisk-dev mailing list
To UNSUBSCRIBE or update options visit:
   http://lists.digium.com/mailman/listinfo/asterisk-dev

[asterisk-dev] Change in asterisk[12]: main/editline: Add .gitignore.

[Matt Jordan (Code Review)]

Matt Jordan has posted comments on this change.

Change subject: main/editline: Add .gitignore.
..


Patch Set 1: Code-Review+1

-- 
To view, visit https://gerrit.asterisk.org/83
To unsubscribe, visit https://gerrit.asterisk.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I68c7bf375ea46282689e5a706534b69fca233b5d
Gerrit-PatchSet: 1
Gerrit-Project: asterisk
Gerrit-Branch: 12
Gerrit-Owner: George Joseph 
Gerrit-Reviewer: Corey Farrell 
Gerrit-Reviewer: Matt Jordan 
Gerrit-HasComments: No

-- 
_
-- Bandwidth and Colocation Provided by http://www.api-digital.com --

asterisk-dev mailing list
To UNSUBSCRIBE or update options visit:
   http://lists.digium.com/mailman/listinfo/asterisk-dev

[asterisk-dev] Change in asterisk[12]: .gitignore: Ignore tarballs (*.gz)

[Matt Jordan (Code Review)]

Matt Jordan has posted comments on this change.

Change subject: .gitignore: Ignore tarballs (*.gz)
..


Patch Set 1: Code-Review+1

-- 
To view, visit https://gerrit.asterisk.org/85
To unsubscribe, visit https://gerrit.asterisk.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: Ie84f085cc0fa51262209e7bfc1b1ba8c04a1ef59
Gerrit-PatchSet: 1
Gerrit-Project: asterisk
Gerrit-Branch: 12
Gerrit-Owner: George Joseph 
Gerrit-Reviewer: Matt Jordan 
Gerrit-HasComments: No

-- 
_
-- Bandwidth and Colocation Provided by http://www.api-digital.com --

asterisk-dev mailing list
To UNSUBSCRIBE or update options visit:
   http://lists.digium.com/mailman/listinfo/asterisk-dev

[asterisk-dev] Change in asterisk[12]: Add .gitignore and .gitreview files

[Matt Jordan (Code Review)]

Matt Jordan has posted comments on this change.

Change subject: Add .gitignore and .gitreview files
..


Patch Set 1: Code-Review+1

-- 
To view, visit https://gerrit.asterisk.org/81
To unsubscribe, visit https://gerrit.asterisk.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I842a1588ff27d8a0189f12d597f0a7af033d6c69
Gerrit-PatchSet: 1
Gerrit-Project: asterisk
Gerrit-Branch: 12
Gerrit-Owner: George Joseph 
Gerrit-Reviewer: Matt Jordan 
Gerrit-HasComments: No

-- 
_
-- Bandwidth and Colocation Provided by http://www.api-digital.com --

asterisk-dev mailing list
To UNSUBSCRIBE or update options visit:
   http://lists.digium.com/mailman/listinfo/asterisk-dev

[asterisk-dev] Change in asterisk[1.8]: Add .gitignore and .gitreview files

[Matt Jordan (Code Review)]

Matt Jordan has posted comments on this change.

Change subject: Add .gitignore and .gitreview files
..


Patch Set 1: Code-Review+1

-- 
To view, visit https://gerrit.asterisk.org/82
To unsubscribe, visit https://gerrit.asterisk.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I842a1588ff27d8a0189f12d597f0a7af033d6c69
Gerrit-PatchSet: 1
Gerrit-Project: asterisk
Gerrit-Branch: 1.8
Gerrit-Owner: George Joseph 
Gerrit-Reviewer: Matt Jordan 
Gerrit-HasComments: No

-- 
_
-- Bandwidth and Colocation Provided by http://www.api-digital.com --

asterisk-dev mailing list
To UNSUBSCRIBE or update options visit:
   http://lists.digium.com/mailman/listinfo/asterisk-dev

[asterisk-dev] Change in asterisk[master]: build_tools/make_version: Update version parsing for Git mig...

[Matt Jordan (Code Review)]

Matt Jordan has submitted this change and it was merged.

Change subject: build_tools/make_version: Update version parsing for Git 
migration
..


build_tools/make_version: Update version parsing for Git migration

External systems - such as the Asterisk Test Suite - require knowledge of the
upstream branch. Unfortunately, after moving to Git, the Asterisk version
currently consists of only a 'GIT" prefix followed by an object blob,
e.g., GIT-as08d7. This makes it difficult for such systems to know what
features are available in a particular check out of Asterisk.

This patch fixes this by hardcoding the branch in a variable in the
make_version script. Since the mainline branches are not changed often -
typically only once a year - this is a reasonable approach to solving
the problem, and is more reliable than parsing the output of 'git branch
-vv'. Branches that track off of an upstream primary branch will then get the
benefit of knowing which mainline branch they are currently based off
of.

ASTERISK-24954 #close

Change-Id: I8090d5d548b6d19e917157ed530b914b7eaf9799
---
M build_tools/make_version
1 file changed, 4 insertions(+), 3 deletions(-)

Approvals:
  Matt Jordan: Looks good to me, approved; Verified
  George Joseph: Looks good to me, but someone else must approve



diff --git a/build_tools/make_version b/build_tools/make_version
index d11c096..fd14a55 100755
--- a/build_tools/make_version
+++ b/build_tools/make_version
@@ -3,6 +3,7 @@
 AWK=${AWK:-awk}
 GIT=${GIT:-git}
 GREP=${GREP:-grep}
+MAINLINE_BRANCH=master
 
 if [ -f ${1}/.version ]; then
 cat ${1}/.version
@@ -98,16 +99,16 @@
 MODIFIED=""
 SVN_REV=`${GIT} log --pretty=full -1 | ${GREP} -F "git-svn-id:" | sed -e 
"s/.*\@\([^\s]*\)\s.*/\1/g"`
 if [ -z "$SVN_REV" ]; then
-VERSION=GIT-`${GIT} describe --long --always --tags --dirty=M 2> 
/dev/null`
+VERSION=`${GIT} describe --long --always --tags --dirty=M 2> /dev/null`
 if [ $? -ne 0 ]; then
 if [ "`${GIT} ls-files -m | wc -l`" != "0" ]; then
 MODIFIED="M"
 fi
 # Some older versions of git do not support all the above
 # options.
-VERSION=GIT-`${GIT} rev-parse --short --verify HEAD`${MODIFIED}
+VERSION=`${GIT} rev-parse --short --verify HEAD`${MODIFIED}
 fi
-echo ${VERSION}
+echo GIT-${MAINLINE_BRANCH}-${VERSION}
 else
 PARTS=`LANG=C ${GIT} log --pretty=full | ${GREP} -F "git-svn-id:" | 
head -1 | ${AWK} '{print $2;}' | sed -e s:^.*/svn/$2/:: | sed -e 's:/: :g' | 
sed -e 's/@.*$//g'`
 BRANCH=0

-- 
To view, visit https://gerrit.asterisk.org/80
To unsubscribe, visit https://gerrit.asterisk.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I8090d5d548b6d19e917157ed530b914b7eaf9799
Gerrit-PatchSet: 1
Gerrit-Project: asterisk
Gerrit-Branch: master
Gerrit-Owner: Matt Jordan 
Gerrit-Reviewer: George Joseph 
Gerrit-Reviewer: Matt Jordan 

-- 
_
-- Bandwidth and Colocation Provided by http://www.api-digital.com --

asterisk-dev mailing list
To UNSUBSCRIBE or update options visit:
   http://lists.digium.com/mailman/listinfo/asterisk-dev

[asterisk-dev] Change in asterisk[13]: build_tools/make_version: Update version parsing for Git mig...

[Matt Jordan (Code Review)]

Matt Jordan has submitted this change and it was merged.

Change subject: build_tools/make_version: Update version parsing for Git 
migration
..


build_tools/make_version: Update version parsing for Git migration

External systems - such as the Asterisk Test Suite - require knowledge of the
upstream branch. Unfortunately, after moving to Git, the Asterisk version
currently consists of only a 'GIT" prefix followed by an object blob,
e.g., GIT-as08d7. This makes it difficult for such systems to know what
features are available in a particular check out of Asterisk.

This patch fixes this by hardcoding the branch in a variable in the
make_version script. Since the mainline branches are not changed often -
typically only once a year - this is a reasonable approach to solving
the problem, and is more reliable than parsing the output of 'git branch
-vv'. Branches that track off of an upstream primary branch will then get the
benefit of knowing which mainline branch they are currently based off
of.

ASTERISK-24954 #close

Change-Id: I8090d5d548b6d19e917157ed530b914b7eaf9799
---
M build_tools/make_version
1 file changed, 4 insertions(+), 3 deletions(-)

Approvals:
  Matt Jordan: Looks good to me, approved; Verified
  George Joseph: Looks good to me, but someone else must approve



diff --git a/build_tools/make_version b/build_tools/make_version
index d11c096..99d5dee 100755
--- a/build_tools/make_version
+++ b/build_tools/make_version
@@ -3,6 +3,7 @@
 AWK=${AWK:-awk}
 GIT=${GIT:-git}
 GREP=${GREP:-grep}
+MAINLINE_BRANCH=13
 
 if [ -f ${1}/.version ]; then
 cat ${1}/.version
@@ -98,16 +99,16 @@
 MODIFIED=""
 SVN_REV=`${GIT} log --pretty=full -1 | ${GREP} -F "git-svn-id:" | sed -e 
"s/.*\@\([^\s]*\)\s.*/\1/g"`
 if [ -z "$SVN_REV" ]; then
-VERSION=GIT-`${GIT} describe --long --always --tags --dirty=M 2> 
/dev/null`
+VERSION=`${GIT} describe --long --always --tags --dirty=M 2> /dev/null`
 if [ $? -ne 0 ]; then
 if [ "`${GIT} ls-files -m | wc -l`" != "0" ]; then
 MODIFIED="M"
 fi
 # Some older versions of git do not support all the above
 # options.
-VERSION=GIT-`${GIT} rev-parse --short --verify HEAD`${MODIFIED}
+VERSION=`${GIT} rev-parse --short --verify HEAD`${MODIFIED}
 fi
-echo ${VERSION}
+echo GIT-${MAINLINE_BRANCH}-${VERSION}
 else
 PARTS=`LANG=C ${GIT} log --pretty=full | ${GREP} -F "git-svn-id:" | 
head -1 | ${AWK} '{print $2;}' | sed -e s:^.*/svn/$2/:: | sed -e 's:/: :g' | 
sed -e 's/@.*$//g'`
 BRANCH=0

-- 
To view, visit https://gerrit.asterisk.org/79
To unsubscribe, visit https://gerrit.asterisk.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I8090d5d548b6d19e917157ed530b914b7eaf9799
Gerrit-PatchSet: 1
Gerrit-Project: asterisk
Gerrit-Branch: 13
Gerrit-Owner: Matt Jordan 
Gerrit-Reviewer: George Joseph 
Gerrit-Reviewer: Matt Jordan 

-- 
_
-- Bandwidth and Colocation Provided by http://www.api-digital.com --

asterisk-dev mailing list
To UNSUBSCRIBE or update options visit:
   http://lists.digium.com/mailman/listinfo/asterisk-dev

[asterisk-dev] Change in asterisk[master]: build_tools/make_version: Update version parsing for Git mig...

[Matt Jordan (Code Review)]

Matt Jordan has posted comments on this change.

Change subject: build_tools/make_version: Update version parsing for Git 
migration
..


Patch Set 1: Verified+1 Code-Review+2

-- 
To view, visit https://gerrit.asterisk.org/80
To unsubscribe, visit https://gerrit.asterisk.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I8090d5d548b6d19e917157ed530b914b7eaf9799
Gerrit-PatchSet: 1
Gerrit-Project: asterisk
Gerrit-Branch: master
Gerrit-Owner: Matt Jordan 
Gerrit-Reviewer: George Joseph 
Gerrit-Reviewer: Matt Jordan 
Gerrit-HasComments: No

-- 
_
-- Bandwidth and Colocation Provided by http://www.api-digital.com --

asterisk-dev mailing list
To UNSUBSCRIBE or update options visit:
   http://lists.digium.com/mailman/listinfo/asterisk-dev

[asterisk-dev] Change in asterisk[13]: build_tools/make_version: Update version parsing for Git mig...

[Matt Jordan (Code Review)]

Matt Jordan has posted comments on this change.

Change subject: build_tools/make_version: Update version parsing for Git 
migration
..


Patch Set 1: Code-Review+2 Verified+1

-- 
To view, visit https://gerrit.asterisk.org/79
To unsubscribe, visit https://gerrit.asterisk.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I8090d5d548b6d19e917157ed530b914b7eaf9799
Gerrit-PatchSet: 1
Gerrit-Project: asterisk
Gerrit-Branch: 13
Gerrit-Owner: Matt Jordan 
Gerrit-Reviewer: George Joseph 
Gerrit-Reviewer: Matt Jordan 
Gerrit-HasComments: No

-- 
_
-- Bandwidth and Colocation Provided by http://www.api-digital.com --

asterisk-dev mailing list
To UNSUBSCRIBE or update options visit:
   http://lists.digium.com/mailman/listinfo/asterisk-dev

[asterisk-dev] Change in asterisk[12]: build_tools/make_version: Update version parsing for Git mig...

[Matt Jordan (Code Review)]

Matt Jordan has posted comments on this change.

Change subject: build_tools/make_version: Update version parsing for Git 
migration
..


Patch Set 1: Code-Review+2 Verified+1

-- 
To view, visit https://gerrit.asterisk.org/78
To unsubscribe, visit https://gerrit.asterisk.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I8090d5d548b6d19e917157ed530b914b7eaf9799
Gerrit-PatchSet: 1
Gerrit-Project: asterisk
Gerrit-Branch: 12
Gerrit-Owner: Matt Jordan 
Gerrit-Reviewer: George Joseph 
Gerrit-Reviewer: Matt Jordan 
Gerrit-HasComments: No

-- 
_
-- Bandwidth and Colocation Provided by http://www.api-digital.com --

asterisk-dev mailing list
To UNSUBSCRIBE or update options visit:
   http://lists.digium.com/mailman/listinfo/asterisk-dev

[asterisk-dev] Change in asterisk[12]: build_tools/make_version: Update version parsing for Git mig...

[Matt Jordan (Code Review)]

Matt Jordan has submitted this change and it was merged.

Change subject: build_tools/make_version: Update version parsing for Git 
migration
..


build_tools/make_version: Update version parsing for Git migration

External systems - such as the Asterisk Test Suite - require knowledge of the
upstream branch. Unfortunately, after moving to Git, the Asterisk version
currently consists of only a 'GIT" prefix followed by an object blob,
e.g., GIT-as08d7. This makes it difficult for such systems to know what
features are available in a particular check out of Asterisk.

This patch fixes this by hardcoding the branch in a variable in the
make_version script. Since the mainline branches are not changed often -
typically only once a year - this is a reasonable approach to solving
the problem, and is more reliable than parsing the output of 'git branch
-vv'. Branches that track off of an upstream primary branch will then get the
benefit of knowing which mainline branch they are currently based off
of.

ASTERISK-24954 #close

Change-Id: I8090d5d548b6d19e917157ed530b914b7eaf9799
---
M build_tools/make_version
1 file changed, 4 insertions(+), 3 deletions(-)

Approvals:
  Matt Jordan: Looks good to me, approved; Verified
  George Joseph: Looks good to me, but someone else must approve



diff --git a/build_tools/make_version b/build_tools/make_version
index d11c096..3608341 100755
--- a/build_tools/make_version
+++ b/build_tools/make_version
@@ -3,6 +3,7 @@
 AWK=${AWK:-awk}
 GIT=${GIT:-git}
 GREP=${GREP:-grep}
+MAINLINE_BRANCH=12
 
 if [ -f ${1}/.version ]; then
 cat ${1}/.version
@@ -98,16 +99,16 @@
 MODIFIED=""
 SVN_REV=`${GIT} log --pretty=full -1 | ${GREP} -F "git-svn-id:" | sed -e 
"s/.*\@\([^\s]*\)\s.*/\1/g"`
 if [ -z "$SVN_REV" ]; then
-VERSION=GIT-`${GIT} describe --long --always --tags --dirty=M 2> 
/dev/null`
+VERSION=`${GIT} describe --long --always --tags --dirty=M 2> /dev/null`
 if [ $? -ne 0 ]; then
 if [ "`${GIT} ls-files -m | wc -l`" != "0" ]; then
 MODIFIED="M"
 fi
 # Some older versions of git do not support all the above
 # options.
-VERSION=GIT-`${GIT} rev-parse --short --verify HEAD`${MODIFIED}
+VERSION=`${GIT} rev-parse --short --verify HEAD`${MODIFIED}
 fi
-echo ${VERSION}
+echo GIT-${MAINLINE_BRANCH}-${VERSION}
 else
 PARTS=`LANG=C ${GIT} log --pretty=full | ${GREP} -F "git-svn-id:" | 
head -1 | ${AWK} '{print $2;}' | sed -e s:^.*/svn/$2/:: | sed -e 's:/: :g' | 
sed -e 's/@.*$//g'`
 BRANCH=0

-- 
To view, visit https://gerrit.asterisk.org/78
To unsubscribe, visit https://gerrit.asterisk.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I8090d5d548b6d19e917157ed530b914b7eaf9799
Gerrit-PatchSet: 1
Gerrit-Project: asterisk
Gerrit-Branch: 12
Gerrit-Owner: Matt Jordan 
Gerrit-Reviewer: George Joseph 
Gerrit-Reviewer: Matt Jordan 

-- 
_
-- Bandwidth and Colocation Provided by http://www.api-digital.com --

asterisk-dev mailing list
To UNSUBSCRIBE or update options visit:
   http://lists.digium.com/mailman/listinfo/asterisk-dev

[asterisk-dev] Change in asterisk[1.8]: build_tools/make_version: Update version parsing for Git mig...

[Matt Jordan (Code Review)]

Matt Jordan has posted comments on this change.

Change subject: build_tools/make_version: Update version parsing for Git 
migration
..


Patch Set 1: Code-Review+2 Verified+1

-- 
To view, visit https://gerrit.asterisk.org/76
To unsubscribe, visit https://gerrit.asterisk.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I8090d5d548b6d19e917157ed530b914b7eaf9799
Gerrit-PatchSet: 1
Gerrit-Project: asterisk
Gerrit-Branch: 1.8
Gerrit-Owner: Matt Jordan 
Gerrit-Reviewer: George Joseph 
Gerrit-Reviewer: Matt Jordan 
Gerrit-HasComments: No

-- 
_
-- Bandwidth and Colocation Provided by http://www.api-digital.com --

asterisk-dev mailing list
To UNSUBSCRIBE or update options visit:
   http://lists.digium.com/mailman/listinfo/asterisk-dev

[asterisk-dev] Change in asterisk[1.8]: build_tools/make_version: Update version parsing for Git mig...

[Matt Jordan (Code Review)]

Matt Jordan has submitted this change and it was merged.

Change subject: build_tools/make_version: Update version parsing for Git 
migration
..


build_tools/make_version: Update version parsing for Git migration

External systems - such as the Asterisk Test Suite - require knowledge of the
upstream branch. Unfortunately, after moving to Git, the Asterisk version
currently consists of only a 'GIT" prefix followed by an object blob,
e.g., GIT-as08d7. This makes it difficult for such systems to know what
features are available in a particular check out of Asterisk.

This patch fixes this by hardcoding the branch in a variable in the
make_version script. Since the mainline branches are not changed often -
typically only once a year - this is a reasonable approach to solving
the problem, and is more reliable than parsing the output of 'git branch
-vv'. Branches that track off of an upstream primary branch will then get the
benefit of knowing which mainline branch they are currently based off
of.

ASTERISK-24954 #close

Change-Id: I8090d5d548b6d19e917157ed530b914b7eaf9799
---
M build_tools/make_version
1 file changed, 5 insertions(+), 3 deletions(-)

Approvals:
  Matt Jordan: Looks good to me, approved; Verified
  George Joseph: Looks good to me, but someone else must approve



diff --git a/build_tools/make_version b/build_tools/make_version
index de0b97e..556021c 100755
--- a/build_tools/make_version
+++ b/build_tools/make_version
@@ -1,5 +1,7 @@
 #!/bin/sh
 
+MAINLINE_BRANCH=1.8
+
 if [ -f ${1}/.version ]; then
 cat ${1}/.version
 elif [ -d ${1}/.svn ]; then
@@ -94,16 +96,16 @@
 MODIFIED=""
 SVN_REV=`${GIT} log --pretty=full -1 | grep -F "git-svn-id:" | sed -e 
"s/.*\@\([^\s]*\)\s.*/\1/g"`
 if [ -z "$SVN_REV" ]; then
-VERSION=GIT-`${GIT} describe --long --always --tags --dirty=M 2> 
/dev/null`
+VERSION=`${GIT} describe --long --always --tags --dirty=M 2> /dev/null`
 if [ $? -ne 0 ]; then
 if [ "`${GIT} ls-files -m | wc -l`" != "0" ]; then
 MODIFIED="M"
 fi
 # Some older versions of git do not support all the above
 # options.
-VERSION=GIT-`${GIT} rev-parse --short --verify HEAD`${MODIFIED}
+VERSION=`${GIT} rev-parse --short --verify HEAD`${MODIFIED}
 fi
-echo ${VERSION}
+echo GIT-${MAINLINE_BRANCH}-${VERSION}
 else
 PARTS=`LANG=C ${GIT} log --pretty=full | grep -F "git-svn-id:" | head 
-1 | awk '{print $2;}' | sed -e s:^.*/svn/$2/:: | sed -e 's:/: :g' | sed -e 
's/@.*$//g'`
 BRANCH=0

-- 
To view, visit https://gerrit.asterisk.org/76
To unsubscribe, visit https://gerrit.asterisk.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I8090d5d548b6d19e917157ed530b914b7eaf9799
Gerrit-PatchSet: 1
Gerrit-Project: asterisk
Gerrit-Branch: 1.8
Gerrit-Owner: Matt Jordan 
Gerrit-Reviewer: George Joseph 
Gerrit-Reviewer: Matt Jordan 

-- 
_
-- Bandwidth and Colocation Provided by http://www.api-digital.com --

asterisk-dev mailing list
To UNSUBSCRIBE or update options visit:
   http://lists.digium.com/mailman/listinfo/asterisk-dev

[asterisk-dev] Change in asterisk[11]: build_tools/make_version: Update version parsing for Git mig...

[Matt Jordan (Code Review)]

Matt Jordan has posted comments on this change.

Change subject: build_tools/make_version: Update version parsing for Git 
migration
..


Patch Set 1: Code-Review+2 Verified+1

-- 
To view, visit https://gerrit.asterisk.org/77
To unsubscribe, visit https://gerrit.asterisk.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I8090d5d548b6d19e917157ed530b914b7eaf9799
Gerrit-PatchSet: 1
Gerrit-Project: asterisk
Gerrit-Branch: 11
Gerrit-Owner: Matt Jordan 
Gerrit-Reviewer: George Joseph 
Gerrit-Reviewer: Matt Jordan 
Gerrit-HasComments: No

-- 
_
-- Bandwidth and Colocation Provided by http://www.api-digital.com --

asterisk-dev mailing list
To UNSUBSCRIBE or update options visit:
   http://lists.digium.com/mailman/listinfo/asterisk-dev

[asterisk-dev] Change in asterisk[11]: build_tools/make_version: Update version parsing for Git mig...

[Matt Jordan (Code Review)]

Matt Jordan has submitted this change and it was merged.

Change subject: build_tools/make_version: Update version parsing for Git 
migration
..


build_tools/make_version: Update version parsing for Git migration

External systems - such as the Asterisk Test Suite - require knowledge of the
upstream branch. Unfortunately, after moving to Git, the Asterisk version
currently consists of only a 'GIT" prefix followed by an object blob,
e.g., GIT-as08d7. This makes it difficult for such systems to know what
features are available in a particular check out of Asterisk.

This patch fixes this by hardcoding the branch in a variable in the
make_version script. Since the mainline branches are not changed often -
typically only once a year - this is a reasonable approach to solving
the problem, and is more reliable than parsing the output of 'git branch
-vv'. Branches that track off of an upstream primary branch will then get the
benefit of knowing which mainline branch they are currently based off
of.

ASTERISK-24954 #close

Change-Id: I8090d5d548b6d19e917157ed530b914b7eaf9799
---
M build_tools/make_version
1 file changed, 5 insertions(+), 3 deletions(-)

Approvals:
  Matt Jordan: Looks good to me, approved; Verified
  George Joseph: Looks good to me, but someone else must approve



diff --git a/build_tools/make_version b/build_tools/make_version
index de0b97e..4174844 100755
--- a/build_tools/make_version
+++ b/build_tools/make_version
@@ -1,5 +1,7 @@
 #!/bin/sh
 
+MAINLINE_BRANCH=11
+
 if [ -f ${1}/.version ]; then
 cat ${1}/.version
 elif [ -d ${1}/.svn ]; then
@@ -94,16 +96,16 @@
 MODIFIED=""
 SVN_REV=`${GIT} log --pretty=full -1 | grep -F "git-svn-id:" | sed -e 
"s/.*\@\([^\s]*\)\s.*/\1/g"`
 if [ -z "$SVN_REV" ]; then
-VERSION=GIT-`${GIT} describe --long --always --tags --dirty=M 2> 
/dev/null`
+VERSION=`${GIT} describe --long --always --tags --dirty=M 2> /dev/null`
 if [ $? -ne 0 ]; then
 if [ "`${GIT} ls-files -m | wc -l`" != "0" ]; then
 MODIFIED="M"
 fi
 # Some older versions of git do not support all the above
 # options.
-VERSION=GIT-`${GIT} rev-parse --short --verify HEAD`${MODIFIED}
+VERSION=`${GIT} rev-parse --short --verify HEAD`${MODIFIED}
 fi
-echo ${VERSION}
+echo GIT-${MAINLINE_BRANCH}-${VERSION}
 else
 PARTS=`LANG=C ${GIT} log --pretty=full | grep -F "git-svn-id:" | head 
-1 | awk '{print $2;}' | sed -e s:^.*/svn/$2/:: | sed -e 's:/: :g' | sed -e 
's/@.*$//g'`
 BRANCH=0

-- 
To view, visit https://gerrit.asterisk.org/77
To unsubscribe, visit https://gerrit.asterisk.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I8090d5d548b6d19e917157ed530b914b7eaf9799
Gerrit-PatchSet: 1
Gerrit-Project: asterisk
Gerrit-Branch: 11
Gerrit-Owner: Matt Jordan 
Gerrit-Reviewer: George Joseph 
Gerrit-Reviewer: Matt Jordan 

-- 
_
-- Bandwidth and Colocation Provided by http://www.api-digital.com --

asterisk-dev mailing list
To UNSUBSCRIBE or update options visit:
   http://lists.digium.com/mailman/listinfo/asterisk-dev

[asterisk-dev] Change in asterisk[master]: build_tools/make_version: Update version parsing for Git mig...

[Matt Jordan (Code Review)]

Matt Jordan has uploaded a new change for review.

  https://gerrit.asterisk.org/80

Change subject: build_tools/make_version: Update version parsing for Git 
migration
..

build_tools/make_version: Update version parsing for Git migration

External systems - such as the Asterisk Test Suite - require knowledge of the
upstream branch. Unfortunately, after moving to Git, the Asterisk version
currently consists of only a 'GIT" prefix followed by an object blob,
e.g., GIT-as08d7. This makes it difficult for such systems to know what
features are available in a particular check out of Asterisk.

This patch fixes this by hardcoding the branch in a variable in the
make_version script. Since the mainline branches are not changed often -
typically only once a year - this is a reasonable approach to solving
the problem, and is more reliable than parsing the output of 'git branch
-vv'. Branches that track off of an upstream primary branch will then get the
benefit of knowing which mainline branch they are currently based off
of.

ASTERISK-24954 #close

Change-Id: I8090d5d548b6d19e917157ed530b914b7eaf9799
---
M build_tools/make_version
1 file changed, 4 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.asterisk.org:29418/asterisk refs/changes/80/80/1

diff --git a/build_tools/make_version b/build_tools/make_version
index d11c096..fd14a55 100755
--- a/build_tools/make_version
+++ b/build_tools/make_version
@@ -3,6 +3,7 @@
 AWK=${AWK:-awk}
 GIT=${GIT:-git}
 GREP=${GREP:-grep}
+MAINLINE_BRANCH=master
 
 if [ -f ${1}/.version ]; then
 cat ${1}/.version
@@ -98,16 +99,16 @@
 MODIFIED=""
 SVN_REV=`${GIT} log --pretty=full -1 | ${GREP} -F "git-svn-id:" | sed -e 
"s/.*\@\([^\s]*\)\s.*/\1/g"`
 if [ -z "$SVN_REV" ]; then
-VERSION=GIT-`${GIT} describe --long --always --tags --dirty=M 2> 
/dev/null`
+VERSION=`${GIT} describe --long --always --tags --dirty=M 2> /dev/null`
 if [ $? -ne 0 ]; then
 if [ "`${GIT} ls-files -m | wc -l`" != "0" ]; then
 MODIFIED="M"
 fi
 # Some older versions of git do not support all the above
 # options.
-VERSION=GIT-`${GIT} rev-parse --short --verify HEAD`${MODIFIED}
+VERSION=`${GIT} rev-parse --short --verify HEAD`${MODIFIED}
 fi
-echo ${VERSION}
+echo GIT-${MAINLINE_BRANCH}-${VERSION}
 else
 PARTS=`LANG=C ${GIT} log --pretty=full | ${GREP} -F "git-svn-id:" | 
head -1 | ${AWK} '{print $2;}' | sed -e s:^.*/svn/$2/:: | sed -e 's:/: :g' | 
sed -e 's/@.*$//g'`
 BRANCH=0

-- 
To view, visit https://gerrit.asterisk.org/80
To unsubscribe, visit https://gerrit.asterisk.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I8090d5d548b6d19e917157ed530b914b7eaf9799
Gerrit-PatchSet: 1
Gerrit-Project: asterisk
Gerrit-Branch: master
Gerrit-Owner: Matt Jordan 

-- 
_
-- Bandwidth and Colocation Provided by http://www.api-digital.com --

asterisk-dev mailing list
To UNSUBSCRIBE or update options visit:
   http://lists.digium.com/mailman/listinfo/asterisk-dev

[asterisk-dev] Change in asterisk[12]: build_tools/make_version: Update version parsing for Git mig...

[Matt Jordan (Code Review)]

Matt Jordan has uploaded a new change for review.

  https://gerrit.asterisk.org/78

Change subject: build_tools/make_version: Update version parsing for Git 
migration
..

build_tools/make_version: Update version parsing for Git migration

External systems - such as the Asterisk Test Suite - require knowledge of the
upstream branch. Unfortunately, after moving to Git, the Asterisk version
currently consists of only a 'GIT" prefix followed by an object blob,
e.g., GIT-as08d7. This makes it difficult for such systems to know what
features are available in a particular check out of Asterisk.

This patch fixes this by hardcoding the branch in a variable in the
make_version script. Since the mainline branches are not changed often -
typically only once a year - this is a reasonable approach to solving
the problem, and is more reliable than parsing the output of 'git branch
-vv'. Branches that track off of an upstream primary branch will then get the
benefit of knowing which mainline branch they are currently based off
of.

ASTERISK-24954 #close

Change-Id: I8090d5d548b6d19e917157ed530b914b7eaf9799
---
M build_tools/make_version
1 file changed, 4 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.asterisk.org:29418/asterisk refs/changes/78/78/1

diff --git a/build_tools/make_version b/build_tools/make_version
index d11c096..3608341 100755
--- a/build_tools/make_version
+++ b/build_tools/make_version
@@ -3,6 +3,7 @@
 AWK=${AWK:-awk}
 GIT=${GIT:-git}
 GREP=${GREP:-grep}
+MAINLINE_BRANCH=12
 
 if [ -f ${1}/.version ]; then
 cat ${1}/.version
@@ -98,16 +99,16 @@
 MODIFIED=""
 SVN_REV=`${GIT} log --pretty=full -1 | ${GREP} -F "git-svn-id:" | sed -e 
"s/.*\@\([^\s]*\)\s.*/\1/g"`
 if [ -z "$SVN_REV" ]; then
-VERSION=GIT-`${GIT} describe --long --always --tags --dirty=M 2> 
/dev/null`
+VERSION=`${GIT} describe --long --always --tags --dirty=M 2> /dev/null`
 if [ $? -ne 0 ]; then
 if [ "`${GIT} ls-files -m | wc -l`" != "0" ]; then
 MODIFIED="M"
 fi
 # Some older versions of git do not support all the above
 # options.
-VERSION=GIT-`${GIT} rev-parse --short --verify HEAD`${MODIFIED}
+VERSION=`${GIT} rev-parse --short --verify HEAD`${MODIFIED}
 fi
-echo ${VERSION}
+echo GIT-${MAINLINE_BRANCH}-${VERSION}
 else
 PARTS=`LANG=C ${GIT} log --pretty=full | ${GREP} -F "git-svn-id:" | 
head -1 | ${AWK} '{print $2;}' | sed -e s:^.*/svn/$2/:: | sed -e 's:/: :g' | 
sed -e 's/@.*$//g'`
 BRANCH=0

-- 
To view, visit https://gerrit.asterisk.org/78
To unsubscribe, visit https://gerrit.asterisk.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I8090d5d548b6d19e917157ed530b914b7eaf9799
Gerrit-PatchSet: 1
Gerrit-Project: asterisk
Gerrit-Branch: 12
Gerrit-Owner: Matt Jordan 

-- 
_
-- Bandwidth and Colocation Provided by http://www.api-digital.com --

asterisk-dev mailing list
To UNSUBSCRIBE or update options visit:
   http://lists.digium.com/mailman/listinfo/asterisk-dev

[asterisk-dev] Change in asterisk[13]: build_tools/make_version: Update version parsing for Git mig...

[Matt Jordan (Code Review)]

Matt Jordan has uploaded a new change for review.

  https://gerrit.asterisk.org/79

Change subject: build_tools/make_version: Update version parsing for Git 
migration
..

build_tools/make_version: Update version parsing for Git migration

External systems - such as the Asterisk Test Suite - require knowledge of the
upstream branch. Unfortunately, after moving to Git, the Asterisk version
currently consists of only a 'GIT" prefix followed by an object blob,
e.g., GIT-as08d7. This makes it difficult for such systems to know what
features are available in a particular check out of Asterisk.

This patch fixes this by hardcoding the branch in a variable in the
make_version script. Since the mainline branches are not changed often -
typically only once a year - this is a reasonable approach to solving
the problem, and is more reliable than parsing the output of 'git branch
-vv'. Branches that track off of an upstream primary branch will then get the
benefit of knowing which mainline branch they are currently based off
of.

ASTERISK-24954 #close

Change-Id: I8090d5d548b6d19e917157ed530b914b7eaf9799
---
M build_tools/make_version
1 file changed, 4 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.asterisk.org:29418/asterisk refs/changes/79/79/1

diff --git a/build_tools/make_version b/build_tools/make_version
index d11c096..99d5dee 100755
--- a/build_tools/make_version
+++ b/build_tools/make_version
@@ -3,6 +3,7 @@
 AWK=${AWK:-awk}
 GIT=${GIT:-git}
 GREP=${GREP:-grep}
+MAINLINE_BRANCH=13
 
 if [ -f ${1}/.version ]; then
 cat ${1}/.version
@@ -98,16 +99,16 @@
 MODIFIED=""
 SVN_REV=`${GIT} log --pretty=full -1 | ${GREP} -F "git-svn-id:" | sed -e 
"s/.*\@\([^\s]*\)\s.*/\1/g"`
 if [ -z "$SVN_REV" ]; then
-VERSION=GIT-`${GIT} describe --long --always --tags --dirty=M 2> 
/dev/null`
+VERSION=`${GIT} describe --long --always --tags --dirty=M 2> /dev/null`
 if [ $? -ne 0 ]; then
 if [ "`${GIT} ls-files -m | wc -l`" != "0" ]; then
 MODIFIED="M"
 fi
 # Some older versions of git do not support all the above
 # options.
-VERSION=GIT-`${GIT} rev-parse --short --verify HEAD`${MODIFIED}
+VERSION=`${GIT} rev-parse --short --verify HEAD`${MODIFIED}
 fi
-echo ${VERSION}
+echo GIT-${MAINLINE_BRANCH}-${VERSION}
 else
 PARTS=`LANG=C ${GIT} log --pretty=full | ${GREP} -F "git-svn-id:" | 
head -1 | ${AWK} '{print $2;}' | sed -e s:^.*/svn/$2/:: | sed -e 's:/: :g' | 
sed -e 's/@.*$//g'`
 BRANCH=0

-- 
To view, visit https://gerrit.asterisk.org/79
To unsubscribe, visit https://gerrit.asterisk.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I8090d5d548b6d19e917157ed530b914b7eaf9799
Gerrit-PatchSet: 1
Gerrit-Project: asterisk
Gerrit-Branch: 13
Gerrit-Owner: Matt Jordan 

-- 
_
-- Bandwidth and Colocation Provided by http://www.api-digital.com --

asterisk-dev mailing list
To UNSUBSCRIBE or update options visit:
   http://lists.digium.com/mailman/listinfo/asterisk-dev

[asterisk-dev] Change in asterisk[11]: build_tools/make_version: Update version parsing for Git mig...

[Matt Jordan (Code Review)]

Matt Jordan has uploaded a new change for review.

  https://gerrit.asterisk.org/77

Change subject: build_tools/make_version: Update version parsing for Git 
migration
..

build_tools/make_version: Update version parsing for Git migration

External systems - such as the Asterisk Test Suite - require knowledge of the
upstream branch. Unfortunately, after moving to Git, the Asterisk version
currently consists of only a 'GIT" prefix followed by an object blob,
e.g., GIT-as08d7. This makes it difficult for such systems to know what
features are available in a particular check out of Asterisk.

This patch fixes this by hardcoding the branch in a variable in the
make_version script. Since the mainline branches are not changed often -
typically only once a year - this is a reasonable approach to solving
the problem, and is more reliable than parsing the output of 'git branch
-vv'. Branches that track off of an upstream primary branch will then get the
benefit of knowing which mainline branch they are currently based off
of.

ASTERISK-24954 #close

Change-Id: I8090d5d548b6d19e917157ed530b914b7eaf9799
---
M build_tools/make_version
1 file changed, 5 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.asterisk.org:29418/asterisk refs/changes/77/77/1

diff --git a/build_tools/make_version b/build_tools/make_version
index de0b97e..4174844 100755
--- a/build_tools/make_version
+++ b/build_tools/make_version
@@ -1,5 +1,7 @@
 #!/bin/sh
 
+MAINLINE_BRANCH=11
+
 if [ -f ${1}/.version ]; then
 cat ${1}/.version
 elif [ -d ${1}/.svn ]; then
@@ -94,16 +96,16 @@
 MODIFIED=""
 SVN_REV=`${GIT} log --pretty=full -1 | grep -F "git-svn-id:" | sed -e 
"s/.*\@\([^\s]*\)\s.*/\1/g"`
 if [ -z "$SVN_REV" ]; then
-VERSION=GIT-`${GIT} describe --long --always --tags --dirty=M 2> 
/dev/null`
+VERSION=`${GIT} describe --long --always --tags --dirty=M 2> /dev/null`
 if [ $? -ne 0 ]; then
 if [ "`${GIT} ls-files -m | wc -l`" != "0" ]; then
 MODIFIED="M"
 fi
 # Some older versions of git do not support all the above
 # options.
-VERSION=GIT-`${GIT} rev-parse --short --verify HEAD`${MODIFIED}
+VERSION=`${GIT} rev-parse --short --verify HEAD`${MODIFIED}
 fi
-echo ${VERSION}
+echo GIT-${MAINLINE_BRANCH}-${VERSION}
 else
 PARTS=`LANG=C ${GIT} log --pretty=full | grep -F "git-svn-id:" | head 
-1 | awk '{print $2;}' | sed -e s:^.*/svn/$2/:: | sed -e 's:/: :g' | sed -e 
's/@.*$//g'`
 BRANCH=0

-- 
To view, visit https://gerrit.asterisk.org/77
To unsubscribe, visit https://gerrit.asterisk.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I8090d5d548b6d19e917157ed530b914b7eaf9799
Gerrit-PatchSet: 1
Gerrit-Project: asterisk
Gerrit-Branch: 11
Gerrit-Owner: Matt Jordan 

-- 
_
-- Bandwidth and Colocation Provided by http://www.api-digital.com --

asterisk-dev mailing list
To UNSUBSCRIBE or update options visit:
   http://lists.digium.com/mailman/listinfo/asterisk-dev

[asterisk-dev] Change in asterisk[1.8]: build_tools/make_version: Update version parsing for Git mig...

[Matt Jordan (Code Review)]

Matt Jordan has uploaded a new change for review.

  https://gerrit.asterisk.org/76

Change subject: build_tools/make_version: Update version parsing for Git 
migration
..

build_tools/make_version: Update version parsing for Git migration

External systems - such as the Asterisk Test Suite - require knowledge of the
upstream branch. Unfortunately, after moving to Git, the Asterisk version
currently consists of only a 'GIT" prefix followed by an object blob,
e.g., GIT-as08d7. This makes it difficult for such systems to know what
features are available in a particular check out of Asterisk.

This patch fixes this by hardcoding the branch in a variable in the
make_version script. Since the mainline branches are not changed often -
typically only once a year - this is a reasonable approach to solving
the problem, and is more reliable than parsing the output of 'git branch
-vv'. Branches that track off of an upstream primary branch will then get the
benefit of knowing which mainline branch they are currently based off
of.

ASTERISK-24954 #close

Change-Id: I8090d5d548b6d19e917157ed530b914b7eaf9799
---
M build_tools/make_version
1 file changed, 5 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.asterisk.org:29418/asterisk refs/changes/76/76/1

diff --git a/build_tools/make_version b/build_tools/make_version
index de0b97e..556021c 100755
--- a/build_tools/make_version
+++ b/build_tools/make_version
@@ -1,5 +1,7 @@
 #!/bin/sh
 
+MAINLINE_BRANCH=1.8
+
 if [ -f ${1}/.version ]; then
 cat ${1}/.version
 elif [ -d ${1}/.svn ]; then
@@ -94,16 +96,16 @@
 MODIFIED=""
 SVN_REV=`${GIT} log --pretty=full -1 | grep -F "git-svn-id:" | sed -e 
"s/.*\@\([^\s]*\)\s.*/\1/g"`
 if [ -z "$SVN_REV" ]; then
-VERSION=GIT-`${GIT} describe --long --always --tags --dirty=M 2> 
/dev/null`
+VERSION=`${GIT} describe --long --always --tags --dirty=M 2> /dev/null`
 if [ $? -ne 0 ]; then
 if [ "`${GIT} ls-files -m | wc -l`" != "0" ]; then
 MODIFIED="M"
 fi
 # Some older versions of git do not support all the above
 # options.
-VERSION=GIT-`${GIT} rev-parse --short --verify HEAD`${MODIFIED}
+VERSION=`${GIT} rev-parse --short --verify HEAD`${MODIFIED}
 fi
-echo ${VERSION}
+echo GIT-${MAINLINE_BRANCH}-${VERSION}
 else
 PARTS=`LANG=C ${GIT} log --pretty=full | grep -F "git-svn-id:" | head 
-1 | awk '{print $2;}' | sed -e s:^.*/svn/$2/:: | sed -e 's:/: :g' | sed -e 
's/@.*$//g'`
 BRANCH=0

-- 
To view, visit https://gerrit.asterisk.org/76
To unsubscribe, visit https://gerrit.asterisk.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I8090d5d548b6d19e917157ed530b914b7eaf9799
Gerrit-PatchSet: 1
Gerrit-Project: asterisk
Gerrit-Branch: 1.8
Gerrit-Owner: Matt Jordan 

-- 
_
-- Bandwidth and Colocation Provided by http://www.api-digital.com --

asterisk-dev mailing list
To UNSUBSCRIBE or update options visit:
   http://lists.digium.com/mailman/listinfo/asterisk-dev

[asterisk-dev] Change in asterisk[master]: AMI: Fix improper handling of lines that are exactly 1025 by...

[Matt Jordan (Code Review)]

Matt Jordan has posted comments on this change.

Change subject: AMI: Fix improper handling of lines that are exactly 1025 bytes 
long.
..


Patch Set 1: Code-Review+1

-- 
To view, visit https://gerrit.asterisk.org/74
To unsubscribe, visit https://gerrit.asterisk.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: Ifda403e2713b59582c715229814fd64a0733c5ea
Gerrit-PatchSet: 1
Gerrit-Project: asterisk
Gerrit-Branch: master
Gerrit-Owner: Corey Farrell 
Gerrit-Reviewer: Matt Jordan 
Gerrit-HasComments: No

-- 
_
-- Bandwidth and Colocation Provided by http://www.api-digital.com --

asterisk-dev mailing list
To UNSUBSCRIBE or update options visit:
   http://lists.digium.com/mailman/listinfo/asterisk-dev

[asterisk-dev] Change in asterisk[master]: Optional API: Fix handling of sources that are both provider...

[Matt Jordan (Code Review)]

Matt Jordan has posted comments on this change.

Change subject: Optional API: Fix handling of sources that are both provider 
and user.
..


Patch Set 1: Code-Review+1

-- 
To view, visit https://gerrit.asterisk.org/73
To unsubscribe, visit https://gerrit.asterisk.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I8fcf2a5e7b481893e17484ecde4f172c9ffb5679
Gerrit-PatchSet: 1
Gerrit-Project: asterisk
Gerrit-Branch: master
Gerrit-Owner: Corey Farrell 
Gerrit-Reviewer: Corey Farrell 
Gerrit-Reviewer: Matt Jordan 
Gerrit-HasComments: No

-- 
_
-- Bandwidth and Colocation Provided by http://www.api-digital.com --

asterisk-dev mailing list
To UNSUBSCRIBE or update options visit:
   http://lists.digium.com/mailman/listinfo/asterisk-dev

[asterisk-dev] Change in asterisk[13]: res_monitor: Add dependency on func_periodic_hook.

[Matt Jordan (Code Review)]

Matt Jordan has posted comments on this change.

Change subject: res_monitor: Add dependency on func_periodic_hook.
..


Patch Set 1: Code-Review+1

Unfortunate, but apparently necessary.

-- 
To view, visit https://gerrit.asterisk.org/72
To unsubscribe, visit https://gerrit.asterisk.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I8fcf2a5e7b481893e17484ecde4f172c9ffb5679
Gerrit-PatchSet: 1
Gerrit-Project: asterisk
Gerrit-Branch: 13
Gerrit-Owner: Corey Farrell 
Gerrit-Reviewer: Matt Jordan 
Gerrit-HasComments: No

-- 
_
-- Bandwidth and Colocation Provided by http://www.api-digital.com --

asterisk-dev mailing list
To UNSUBSCRIBE or update options visit:
   http://lists.digium.com/mailman/listinfo/asterisk-dev

[asterisk-dev] Change in asterisk[13]: git migration: Remove support for file versions

[Matt Jordan (Code Review)]

Hello Corey Farrell,

I'd like you to reexamine a change.  Please visit

https://gerrit.asterisk.org/60

to look at the new patch set (#3).

Change subject: git migration: Remove support for file versions
..

git migration: Remove support for file versions

Git does not support the ability to replace a token with a version
string during check-in. While it does have support for replacing a
token on clone, this is somewhat sub-optimal: the token is replaced
with the object hash, which is not particularly easy for human
consumption. What's more, in practice, the source file version was often
not terribly useful. Generally, when triaging bugs, the overall version
of Asterisk is far more useful than an individual SVN version of a file.
As a result, this patch removes Asterisk's support for showing source file
versions.

Specifically, it does the following:
* main/asterisk:
  - Refactor the file_version structure to reflect that it no longer
tracks a version field.
  - Alter the "core show file version" CLI command such that it always
reports the version of Asterisk. The file version is no longer
available.

* main/manager: The Version key now always reports the Asterisk version.

* UPGRADE: Add notes for:
  - Modification to the ModuleCheck AMI Action.
  - Modification of the "core show file version" CLI command.

Change-Id: Ia932d3c64cd18a14a3c894109baa657ec0a85d28
---
M UPGRADE.txt
M include/asterisk.h
M main/asterisk.c
M main/manager.c
4 files changed, 79 insertions(+), 56 deletions(-)


  git pull ssh://gerrit.asterisk.org:29418/asterisk refs/changes/60/60/3
-- 
To view, visit https://gerrit.asterisk.org/60
To unsubscribe, visit https://gerrit.asterisk.org/settings

Gerrit-MessageType: newpatchset
Gerrit-Change-Id: Ia932d3c64cd18a14a3c894109baa657ec0a85d28
Gerrit-PatchSet: 3
Gerrit-Project: asterisk
Gerrit-Branch: 13
Gerrit-Owner: Matt Jordan 
Gerrit-Reviewer: Corey Farrell 
Gerrit-Reviewer: Matt Jordan 

-- 
_
-- Bandwidth and Colocation Provided by http://www.api-digital.com --

asterisk-dev mailing list
To UNSUBSCRIBE or update options visit:
   http://lists.digium.com/mailman/listinfo/asterisk-dev

[asterisk-dev] Change in asterisk[13]: git migration: Remove support for file versions

[Matt Jordan (Code Review)]

Matt Jordan has posted comments on this change.

Change subject: git migration: Remove support for file versions
..


Patch Set 2:

(1 comment)

https://gerrit.asterisk.org/#/c/60/2/main/asterisk.c
File main/asterisk.c:

Line 539:   return NULL;
> We need to search for file, return ast_get_version() if it's found.  Return
Whoops. Fixed.


-- 
To view, visit https://gerrit.asterisk.org/60
To unsubscribe, visit https://gerrit.asterisk.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: Ia932d3c64cd18a14a3c894109baa657ec0a85d28
Gerrit-PatchSet: 2
Gerrit-Project: asterisk
Gerrit-Branch: 13
Gerrit-Owner: Matt Jordan 
Gerrit-Reviewer: Corey Farrell 
Gerrit-Reviewer: Matt Jordan 
Gerrit-HasComments: Yes

-- 
_
-- Bandwidth and Colocation Provided by http://www.api-digital.com --

asterisk-dev mailing list
To UNSUBSCRIBE or update options visit:
   http://lists.digium.com/mailman/listinfo/asterisk-dev

[asterisk-dev] Change in asterisk[master]: git migration: Refactor the ASTERISK_FILE_VERSION macro

[Matt Jordan (Code Review)]

.c
M pbx/pbx_spool.c
M res/ael/ael.tab.c
M res/ael/ael_lex.c
M res/ael/pval.c
M res/ari/ari_model_validators.c
M res/ari/ari_websockets.c
M res/ari/cli.c
M res/ari/config.c
M res/ari/resource_applications.c
M res/ari/resource_asterisk.c
M res/ari/resource_bridges.c
M res/ari/resource_channels.c
M res/ari/resource_device_states.c
M res/ari/resource_endpoints.c
M res/ari/resource_events.c
M res/ari/resource_mailboxes.c
M res/ari/resource_playbacks.c
M res/ari/resource_recordings.c
M res/ari/resource_sounds.c
M res/parking/parking_applications.c
M res/parking/parking_bridge_features.c
M res/parking/parking_manager.c
M res/parking/parking_tests.c
M res/parking/parking_ui.c
M res/res_adsi.c
M res/res_ael_share.c
M res/res_agi.c
M res/res_ari.c
M res/res_ari_applications.c
M res/res_ari_asterisk.c
M res/res_ari_bridges.c
M res/res_ari_channels.c
M res/res_ari_device_states.c
M res/res_ari_endpoints.c
M res/res_ari_events.c
M res/res_ari_mailboxes.c
M res/res_ari_model.c
M res/res_ari_playbacks.c
M res/res_ari_recordings.c
M res/res_ari_sounds.c
M res/res_calendar.c
M res/res_calendar_caldav.c
M res/res_calendar_ews.c
M res/res_calendar_exchange.c
M res/res_calendar_icalendar.c
M res/res_chan_stats.c
M res/res_clialiases.c
M res/res_clioriginate.c
M res/res_config_curl.c
M res/res_config_ldap.c
M res/res_config_odbc.c
M res/res_config_pgsql.c
M res/res_config_sqlite.c
M res/res_config_sqlite3.c
M res/res_convert.c
M res/res_corosync.c
M res/res_crypto.c
M res/res_curl.c
M res/res_fax.c
M res/res_fax_spandsp.c
M res/res_format_attr_celt.c
M res/res_format_attr_h263.c
M res/res_format_attr_h264.c
M res/res_format_attr_opus.c
M res/res_format_attr_silk.c
M res/res_hep.c
M res/res_hep_pjsip.c
M res/res_hep_rtcp.c
M res/res_http_post.c
M res/res_http_websocket.c
M res/res_limit.c
M res/res_monitor.c
M res/res_musiconhold.c
M res/res_mutestream.c
M res/res_mwi_external.c
M res/res_mwi_external_ami.c
M res/res_odbc.c
M res/res_parking.c
M res/res_phoneprov.c
M res/res_pjsip/security_events.c
M res/res_pjsip_config_wizard.c
M res/res_pjsip_dlg_options.c
M res/res_pjsip_log_forwarder.c
M res/res_pjsip_logger.c
M res/res_pjsip_sdp_rtp.c
M res/res_pjsip_t38.c
M res/res_pktccops.c
M res/res_realtime.c
M res/res_resolver_unbound.c
M res/res_rtp_asterisk.c
M res/res_rtp_multicast.c
M res/res_security_log.c
M res/res_smdi.c
M res/res_snmp.c
M res/res_sorcery_astdb.c
M res/res_sorcery_config.c
M res/res_sorcery_memory.c
M res/res_sorcery_realtime.c
M res/res_speech.c
M res/res_srtp.c
M res/res_stasis.c
M res/res_stasis_answer.c
M res/res_stasis_device_state.c
M res/res_stasis_mailbox.c
M res/res_stasis_playback.c
M res/res_stasis_recording.c
M res/res_stasis_snoop.c
M res/res_stasis_test.c
M res/res_statsd.c
M res/res_stun_monitor.c
M res/res_timing_dahdi.c
M res/res_timing_pthread.c
M res/res_xmpp.c
M res/snmp/agent.c
M res/stasis/app.c
M res/stasis/command.c
M res/stasis/control.c
M res/stasis/messaging.c
M res/stasis/stasis_bridge.c
M res/stasis_recording/stored.c
M tests/test_abstract_jb.c
M tests/test_acl.c
M tests/test_amihooks.c
M tests/test_aoc.c
M tests/test_app.c
M tests/test_ari.c
M tests/test_ari_model.c
M tests/test_ast_format_str_reduce.c
M tests/test_astobj2.c
M tests/test_astobj2_thrash.c
M tests/test_bucket.c
M tests/test_callerid.c
M tests/test_cdr.c
M tests/test_cel.c
M tests/test_channel_feature_hooks.c
M tests/test_config.c
M tests/test_core_codec.c
M tests/test_core_format.c
M tests/test_db.c
M tests/test_devicestate.c
M tests/test_dlinklists.c
M tests/test_endpoints.c
M tests/test_event.c
M tests/test_expr.c
M tests/test_format_cache.c
M tests/test_format_cap.c
M tests/test_func_file.c
M tests/test_gosub.c
M tests/test_hashtab_thrash.c
M tests/test_heap.c
M tests/test_jitterbuf.c
M tests/test_json.c
M tests/test_linkedlists.c
M tests/test_locale.c
M tests/test_logger.c
M tests/test_message.c
M tests/test_netsock2.c
M tests/test_optional_api.c
M tests/test_pbx.c
M tests/test_poll.c
M tests/test_res_stasis.c
M tests/test_sched.c
M tests/test_security_events.c
M tests/test_skel.c
M tests/test_sorcery.c
M tests/test_sorcery_astdb.c
M tests/test_sorcery_realtime.c
M tests/test_stasis.c
M tests/test_stasis_channels.c
M tests/test_stasis_endpoints.c
M tests/test_strings.c
M tests/test_substitution.c
M tests/test_time.c
M tests/test_uri.c
M tests/test_utils.c
M tests/test_voicemail_api.c
M tests/test_websocket_client.c
M tests/test_xml_escape.c
M utils/ael_main.c
M utils/astdb2sqlite3.c
M utils/astman.c
M utils/check_expr.c
M utils/conf2ael.c
548 files changed, 618 insertions(+), 730 deletions(-)


  git pull ssh://gerrit.asterisk.org:29418/asterisk refs/changes/58/58/3
-- 
To view, visit https://gerrit.asterisk.org/58
To unsubscribe, visit https://gerrit.asterisk.org/settings

Gerrit-MessageType: newpatchset
Gerrit-Change-Id: I6cf0ff280e1668bf4957dc21f32a5ff43444a40e
Gerrit-PatchSet: 3
Gerrit-Project: asterisk
Gerrit-Branch: master
Gerrit-Owner: Matt Jordan 
Gerrit-Reviewer: Corey Farrell 
Gerrit-Rev

[asterisk-dev] Change in asterisk[master]: git migration: Refactor the ASTERISK_FILE_VERSION macro

[Matt Jordan (Code Review)]

rit-MessageType: newpatchset
Gerrit-Change-Id: I6cf0ff280e1668bf4957dc21f32a5ff43444a40e
Gerrit-PatchSet: 2
Gerrit-Project: asterisk
Gerrit-Branch: master
Gerrit-Owner: Matt Jordan 
Gerrit-Reviewer: Corey Farrell 
Gerrit-Reviewer: George Joseph 
Gerrit-Reviewer: Matt Jordan 

-- 
_
-- Bandwidth and Colocation Provided by http://www.api-digital.com --

asterisk-dev mailing list
To UNSUBSCRIBE or update options visit:
   http://lists.digium.com/mailman/listinfo/asterisk-dev

[asterisk-dev] Change in asterisk[master]: git migration: Refactor the ASTERISK_FILE_VERSION macro

[Matt Jordan (Code Review)]

Matt Jordan has posted comments on this change.

Change subject: git migration: Refactor the ASTERISK_FILE_VERSION macro
..


Patch Set 1:

(1 comment)

https://gerrit.asterisk.org/#/c/58/1/cel/cel_radius.c
File cel/cel_radius.c:

Line 36: ASTERISK_REGISTER_FILE(__FILE__, "$Rev$")
> cel_radius.c:36:41: error: macro "ASTERISK_REGISTER_FILE" passed 2 argument
TIL: I don't have libradius installed.


-- 
To view, visit https://gerrit.asterisk.org/58
To unsubscribe, visit https://gerrit.asterisk.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I6cf0ff280e1668bf4957dc21f32a5ff43444a40e
Gerrit-PatchSet: 1
Gerrit-Project: asterisk
Gerrit-Branch: master
Gerrit-Owner: Matt Jordan 
Gerrit-Reviewer: Corey Farrell 
Gerrit-Reviewer: George Joseph 
Gerrit-Reviewer: Matt Jordan 
Gerrit-HasComments: Yes

-- 
_
-- Bandwidth and Colocation Provided by http://www.api-digital.com --

asterisk-dev mailing list
To UNSUBSCRIBE or update options visit:
   http://lists.digium.com/mailman/listinfo/asterisk-dev

[asterisk-dev] Change in asterisk[13]: git migration: Remove support for file versions

[Matt Jordan (Code Review)]

Hello Corey Farrell,

I'd like you to reexamine a change.  Please visit

https://gerrit.asterisk.org/60

to look at the new patch set (#2).

Change subject: git migration: Remove support for file versions
..

git migration: Remove support for file versions

Git does not support the ability to replace a token with a version
string during check-in. While it does have support for replacing a
token on clone, this is somewhat sub-optimal: the token is replaced
with the object hash, which is not particularly easy for human
consumption. What's more, in practice, the source file version was often
not terribly useful. Generally, when triaging bugs, the overall version
of Asterisk is far more useful than an individual SVN version of a file.
As a result, this patch removes Asterisk's support for showing source file
versions.

Specifically, it does the following:
* main/asterisk:
  - Refactor the file_version structure to reflect that it no longer
tracks a version field.
  - Alter the "core show file version" CLI command such that it always
reports the version of Asterisk. The file version is no longer
available.

* main/manager: The Version key now always reports the Asterisk version.

* UPGRADE: Add notes for:
  - Modification to the ModuleCheck AMI Action.
  - Modification of the "core show file version" CLI command.

Change-Id: Ia932d3c64cd18a14a3c894109baa657ec0a85d28
---
M UPGRADE.txt
M include/asterisk.h
M main/asterisk.c
M main/manager.c
4 files changed, 70 insertions(+), 59 deletions(-)


  git pull ssh://gerrit.asterisk.org:29418/asterisk refs/changes/60/60/2
-- 
To view, visit https://gerrit.asterisk.org/60
To unsubscribe, visit https://gerrit.asterisk.org/settings

Gerrit-MessageType: newpatchset
Gerrit-Change-Id: Ia932d3c64cd18a14a3c894109baa657ec0a85d28
Gerrit-PatchSet: 2
Gerrit-Project: asterisk
Gerrit-Branch: 13
Gerrit-Owner: Matt Jordan 
Gerrit-Reviewer: Corey Farrell 

-- 
_
-- Bandwidth and Colocation Provided by http://www.api-digital.com --

asterisk-dev mailing list
To UNSUBSCRIBE or update options visit:
   http://lists.digium.com/mailman/listinfo/asterisk-dev

[asterisk-dev] Change in asterisk[11]: git migration: Remove support for file versions

[Matt Jordan (Code Review)]

Matt Jordan has uploaded a new patch set (#3).

Change subject: git migration: Remove support for file versions
..

git migration: Remove support for file versions

Git does not support the ability to replace a token with a version
string during check-in. While it does have support for replacing a
token on clone, this is somewhat sub-optimal: the token is replaced
with the object hash, which is not particularly easy for human
consumption. What's more, in practice, the source file version was often
not terribly useful. Generally, when triaging bugs, the overall version
of Asterisk is far more useful than an individual SVN version of a file.
As a result, this patch removes Asterisk's support for showing source file
versions.

Specifically, it does the following:
* main/asterisk:
  - Refactor the file_version structure to reflect that it no longer
tracks a version field.
  - Alter the "core show file version" CLI command such that it always
reports the version of Asterisk. The file version is no longer
available.

* main/manager: The Version key now always reports the Asterisk version.

* UPGRADE: Add notes for:
  - Modification to the ModuleCheck AMI Action.
  - Modification to the CLI "core show file version" command.

Change-Id: Ia932d3c64cd18a14a3c894109baa657ec0a85d28
---
M UPGRADE.txt
M include/asterisk.h
M main/asterisk.c
M main/manager.c
4 files changed, 82 insertions(+), 58 deletions(-)


  git pull ssh://gerrit.asterisk.org:29418/asterisk refs/changes/61/61/3
-- 
To view, visit https://gerrit.asterisk.org/61
To unsubscribe, visit https://gerrit.asterisk.org/settings

Gerrit-MessageType: newpatchset
Gerrit-Change-Id: Ia932d3c64cd18a14a3c894109baa657ec0a85d28
Gerrit-PatchSet: 3
Gerrit-Project: asterisk
Gerrit-Branch: 11
Gerrit-Owner: Matt Jordan 
Gerrit-Reviewer: Corey Farrell 
Gerrit-Reviewer: Matt Jordan 

-- 
_
-- Bandwidth and Colocation Provided by http://www.api-digital.com --

asterisk-dev mailing list
To UNSUBSCRIBE or update options visit:
   http://lists.digium.com/mailman/listinfo/asterisk-dev

[asterisk-dev] Change in asterisk[11]: git migration: Remove support for file versions

[Matt Jordan (Code Review)]

Matt Jordan has uploaded a new patch set (#2).

Change subject: git migration: Remove support for file versions
..

git migration: Remove support for file versions

Git does not support the ability to replace a token with a version
string during check-in. While it does have support for replacing a
token on clone, this is somewhat sub-optimal: the token is replaced
with the object hash, which is not particularly easy for human
consumption. What's more, in practice, the source file version was often
not terribly useful. Generally, when triaging bugs, the overall version
of Asterisk is far more useful than an individual SVN version of a file.
As a result, this patch removes Asterisk's support for showing source file
versions.

Specifically, it does the following:
* main/asterisk:
  - Refactor the file_version structure to reflect that it no longer
tracks a version field.
  - Alter the "core show file version" CLI command such that it always
reports the version of Asterisk. The file version is no longer
available.

* main/manager: The Version key now always reports the Asterisk version.

* UPGRADE: Add notes for:
  - Modification to the ModuleCheck AMI Action.
  - Modification to the CLI "core show file version" command.

Change-Id: Ia932d3c64cd18a14a3c894109baa657ec0a85d28
---
M UPGRADE.txt
M include/asterisk.h
M main/asterisk.c
M main/manager.c
4 files changed, 81 insertions(+), 58 deletions(-)


  git pull ssh://gerrit.asterisk.org:29418/asterisk refs/changes/61/61/2
-- 
To view, visit https://gerrit.asterisk.org/61
To unsubscribe, visit https://gerrit.asterisk.org/settings

Gerrit-MessageType: newpatchset
Gerrit-Change-Id: Ia932d3c64cd18a14a3c894109baa657ec0a85d28
Gerrit-PatchSet: 2
Gerrit-Project: asterisk
Gerrit-Branch: 11
Gerrit-Owner: Matt Jordan 
Gerrit-Reviewer: Corey Farrell 
Gerrit-Reviewer: Matt Jordan 

-- 
_
-- Bandwidth and Colocation Provided by http://www.api-digital.com --

asterisk-dev mailing list
To UNSUBSCRIBE or update options visit:
   http://lists.digium.com/mailman/listinfo/asterisk-dev

[asterisk-dev] Change in asterisk[11]: git migration: Remove support for file versions

[Matt Jordan (Code Review)]

Matt Jordan has posted comments on this change.

Change subject: git migration: Remove support for file versions
..


Patch Set 1:

(1 comment)

https://gerrit.asterisk.org/#/c/61/1/main/asterisk.c
File main/asterisk.c:

Line 390:   return NULL;
> You misunderstand.  What I mean is:
That's a very good idea.

How about we keep the CLI command/AMI action in 11/13 as well then, and simply 
mark in the UPGRADE file that they won't be very useful and will be removed in 
14? That reduces the risk of breaking changes mid-stream quite a lot as well.


-- 
To view, visit https://gerrit.asterisk.org/61
To unsubscribe, visit https://gerrit.asterisk.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: Ia932d3c64cd18a14a3c894109baa657ec0a85d28
Gerrit-PatchSet: 1
Gerrit-Project: asterisk
Gerrit-Branch: 11
Gerrit-Owner: Matt Jordan 
Gerrit-Reviewer: Corey Farrell 
Gerrit-Reviewer: Matt Jordan 
Gerrit-HasComments: Yes

-- 
_
-- Bandwidth and Colocation Provided by http://www.api-digital.com --

asterisk-dev mailing list
To UNSUBSCRIBE or update options visit:
   http://lists.digium.com/mailman/listinfo/asterisk-dev

[asterisk-dev] Change in asterisk[11]: git migration: Remove support for file versions

[Matt Jordan (Code Review)]

Matt Jordan has posted comments on this change.

Change subject: git migration: Remove support for file versions
..


Patch Set 1:

(1 comment)

https://gerrit.asterisk.org/#/c/61/1/main/asterisk.c
File main/asterisk.c:

Line 390:   return NULL;
> Sorry I didn't think of this in the review for 13, maybe we should check fo
If we did that, we'd have to keep the version field on the struct, and we'd 
have to go ahead and populate that version field with what is passed by the the 
ASTERISK_FILE_VERSION macro. That results in one of two scenarios:
1) We return "$Revision$" for all files in the source tree
2) We explicitly add a check in this function to see if the string in the 
version field is "$Revision$", and if it is, return a blank or NULL value.

Neither feel quite worth it. If someone was using the function, then the return 
value is still allowed by the function (it just always returns it) - 
ostensibly, they should be handling a NULL return value. Given that the general 
consensus was that this wasn't a feature worth preserving, I think it's okay to 
punt on the case where an external module used this function.

Of course, I'll probably be back a month or two later with a mea culpa... :-)


-- 
To view, visit https://gerrit.asterisk.org/61
To unsubscribe, visit https://gerrit.asterisk.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: Ia932d3c64cd18a14a3c894109baa657ec0a85d28
Gerrit-PatchSet: 1
Gerrit-Project: asterisk
Gerrit-Branch: 11
Gerrit-Owner: Matt Jordan 
Gerrit-Reviewer: Corey Farrell 
Gerrit-Reviewer: Matt Jordan 
Gerrit-HasComments: Yes

-- 
_
-- Bandwidth and Colocation Provided by http://www.api-digital.com --

asterisk-dev mailing list
To UNSUBSCRIBE or update options visit:
   http://lists.digium.com/mailman/listinfo/asterisk-dev

[asterisk-dev] Change in repotools[master]: digium_jira: Refactor module to wrap the Atlassian JIRA REST...

[Matt Jordan (Code Review)]

Matt Jordan has uploaded a new change for review.

  https://gerrit.asterisk.org/69

Change subject: digium_jira: Refactor module to wrap the Atlassian JIRA REST 
client
..

digium_jira: Refactor module to wrap the Atlassian JIRA REST client

Many of the our scripts that use the JIRA REST Python client first have
to obtain credentials from the .jira_login file, or else prompt for
them. The act of getting credentials and setting up the basic client is
done in a number of scripts.

Rather than reproduce that logic across many modules, this patch takes
the defunct digium_jira module and repurposes it to contain those
functions. Since Atlassian no longer supports its SOAP API and we no
longer use it in any of our modules, its reasonable to locate this
functionality in this module.

Change-Id: I69932dd472aef4290af97e809ce6b9ec9c25b39d
---
M digium_jira.py
1 file changed, 30 insertions(+), 173 deletions(-)


  git pull ssh://gerrit.asterisk.org:29418/repotools refs/changes/69/69/1

diff --git a/digium_jira.py b/digium_jira.py
index abbbfaa..06767be 100644
--- a/digium_jira.py
+++ b/digium_jira.py
@@ -1,188 +1,45 @@
 #!/usr/bin/env python
-'''Utilities that assist in accessing the Digium JIRA server.
+"""Utility function that wraps the Atlassian JIRA REST client
 
-Copyright (C) 2009 - 2010, Digium, Inc.
+Copyright (C) 2009 - 2015, Digium, Inc.
 Russell Bryant 
+"""
 
-This module is deprecated in favor of jira-python
-'''
-
-import sys
 import os
-import re
-import urllib2
 import getpass
 
+from jira.client import JIRA
 
-JIRA_WSDL = "https://issues.asterisk.org/jira/rpc/soap/jirasoapservice-v2?wsdl";
+def _get_jira_auth():
+"""Get JIRA credentials"""
+
+try:
+jira_cache = open(os.path.expanduser('~') + "/.jira_login", "r")
+jira_user = jira_cache.readline().strip()
+jira_pw = jira_cache.readline().strip()
+jira_cache.close()
+return (jira_user, jira_pw)
+except IOError:
+pass
+
+# Didn't get auth deatils from file, try interactive instead.
+print "Please enter your username and pw for JIRA."
+jira_user = raw_input("Username: ")
+jira_pw = getpass.getpass("Password: ")
+
+return (jira_user, jira_pw)
 
 
-class DigiumJIRA:
-'''This is a wrapper for the JIRA SOAP API.
+def get_jira_client():
+"""Return a connected JIRA client"""
 
-Each SOAP API call requires JIRA authentication credentials.  This will
-pull the login information from the ~/.jira_login file.  It expects the
-first line in this file to be the username, and the 2nd line to be the
-password.
+jira_user, jira_password = _get_jira_auth()
 
-soap_access - Set to False to not set up JIRA SOAP access.
-'''
-def __init__(self, soap_access=True):
-''' Initialize the DigiumJIRA interface.
+jira_options = {
+'server': 'https://issues.asterisk.org/jira/'
+}
 
-An exception will be raised if authentication information can not be
-read from the ~/.jira_login file.
-'''
-self.mantis_map = None
-self.status_map = None
-if not soap_access:
-return
-import SOAPpy
-self.jira = SOAPpy.WSDL.Proxy(JIRA_WSDL)
-self.__get_jira_auth()
-try:
-self.auth = self.jira.login(self.jira_user, self.jira_pw)
-except:
-print 'Failed to login to JIRA'
-raise
+jira = JIRA(options=jira_options, basic_auth=(jira_user, jira_password))
 
-def __get_jira_auth(self):
-'''Private method that looks up JIRA login credentials.
-'''
-try:
-f = open(os.path.expanduser('~') + "/.jira_login", "r")
-self.jira_user = f.readline().strip()
-self.jira_pw = f.readline().strip()
-f.close()
-return
-except:
-pass
+return jira
 
-# Didn't get auth deatils from file, try interactive instead.
-print "Please enter your username and pw for JIRA."
-self.jira_user = raw_input("Username: ")
-self.jira_pw = getpass.getpass("Password: ")
-
-def get_chart(self, dest, url):
-'''Scrape the chart from a JIRA report URL.
-
-JIRA has nice reporting capabilities for projects.  This function
-allows you to pass in a JIRA report URL and a filename for where to
-save off the chart that is generated for the report.
-
-dest - The filename for where to save the chart.
-url - The JIRA report URL.

[asterisk-dev] Change in repotools[master]: mapmantis: Remove dependency on digium_jira

[Matt Jordan (Code Review)]

Matt Jordan has uploaded a new patch set (#2).

Change subject: mapmantis: Remove dependency on digium_jira
..

mapmantis: Remove dependency on digium_jira

This patch removes the dependency of mapmantis from the digium_jira
module. The DigiumJIRA class, which uses a SOAP library for its
connection back to JIRA, was not strictly necessary as the Mantis
mapping function made no connection back to the JIRA instance.

Change-Id: I0ae337d24e3db7d552406a57a740d260d5c4d2d7
---
M digium_jira.py
M mapmantis.py
2 files changed, 41 insertions(+), 31 deletions(-)


  git pull ssh://gerrit.asterisk.org:29418/repotools refs/changes/68/68/2
-- 
To view, visit https://gerrit.asterisk.org/68
To unsubscribe, visit https://gerrit.asterisk.org/settings

Gerrit-MessageType: newpatchset
Gerrit-Change-Id: I0ae337d24e3db7d552406a57a740d260d5c4d2d7
Gerrit-PatchSet: 2
Gerrit-Project: repotools
Gerrit-Branch: master
Gerrit-Owner: Matt Jordan 

-- 
_
-- Bandwidth and Colocation Provided by http://www.api-digital.com --

asterisk-dev mailing list
To UNSUBSCRIBE or update options visit:
   http://lists.digium.com/mailman/listinfo/asterisk-dev

[asterisk-dev] Change in repotools[master]: mapmantis: Remove dependency on digium_jira

[Matt Jordan (Code Review)]

Matt Jordan has uploaded a new change for review.

  https://gerrit.asterisk.org/68

Change subject: mapmantis: Remove dependency on digium_jira
..

mapmantis: Remove dependency on digium_jira

This patch removes the dependency of mapmantis from the digium_jira
module. The DigiumJIRA class, which uses a SOAP library for its
connection back to JIRA, was not strictly necessary as the Mantis
mapping function made no connection back to the JIRA instance.

Change-Id: I0ae337d24e3db7d552406a57a740d260d5c4d2d7
---
M digium_jira.py
M mapmantis.py
2 files changed, 36 insertions(+), 31 deletions(-)


  git pull ssh://gerrit.asterisk.org:29418/repotools refs/changes/68/68/1

diff --git a/digium_jira.py b/digium_jira.py
index abbbfaa..bd4734f 100644
--- a/digium_jira.py
+++ b/digium_jira.py
@@ -137,28 +137,6 @@
 return f["id"]
 return None
 
-def map_mantis_to_jira(self, mantis_id):
-if self.mantis_map is None:
-try:
-f = open("mantis-to-jira-map.txt", "r")
-except:
-try:
-f = 
open(os.path.join(os.path.dirname(os.path.realpath(__file__)),
-  "mantis-to-jira-map.txt"), 
"r")
-except:
-print "Failed to find mantis-to-jira-map.txt"
-return 1
-self.mantis_map = {}
-for line in f:
-fields = line.split("\t")
-self.mantis_map[fields[0]] = fields[1].strip()
-f.close()
-
-if mantis_id in self.mantis_map:
-return self.mantis_map[mantis_id]
-else:
-return None
-
 def status_to_str(self, status):
 if self.status_map is None:
 statuses = self.jira.getStatuses(self.auth)
diff --git a/mapmantis.py b/mapmantis.py
index 243bd35..450bdea 100755
--- a/mapmantis.py
+++ b/mapmantis.py
@@ -1,16 +1,43 @@
 #!/usr/bin/env python
+"""Find a JIRA issue ID based on the Mantis ID
 
-'''
-This module is deprecated since mantis is no longer in use and it requires 
digium_jira which has been
-deprecated in favor of jira-python
-'''
-
+Copyright (C) 2011-2015, Digium Inc.
+Russell Bryant 
+"""
 import sys
 import os
 
 sys.path.append(os.path.join(os.path.dirname(os.path.realpath(__file__
 
-from digium_jira import DigiumJIRA
+
+def map_mantis_to_jira(mantis_id):
+"""Maps a Mantis issue ID to an Atlassian JIRA ID
+
+Keyword Arguments:
+mantis_id - the Mantis ID to look up
+
+Returns:
+None if no Atlassian JIRA issue is found
+The Atlassian JIRA issue that maps to the Mantis issue
+"""
+
+mantis_map = {}
+try:
+f = open("mantis-to-jira-map.txt", "r")
+except:
+try:
+f = open(os.path.join(os.path.dirname(os.path.realpath(__file__)),
+  "mantis-to-jira-map.txt"), 
"r")
+except:
+print "Failed to find mantis-to-jira-map.txt"
+return 1
+
+for line in f:
+fields = line.split("\t")
+mantis_map[fields[0]] = fields[1].strip()
+f.close()
+
+return mantis_map.get(mantis_id)
 
 
 def main(argv=None):
@@ -18,12 +45,12 @@
 argv = sys.argv
 
 if len(argv) != 2:
-print "usage: %s " % os.path.basename(argv[0])
+print "Usage: %s " % os.path.basename(argv[0])
 return 1
 
-print DigiumJIRA(soap_access=False).map_mantis_to_jira(argv[1]) or "not 
found"
-
+print map_mantis_to_jira(argv[1]) or "No JIRA issue found."
 return 0
 
+
 if __name__ == "__main__":
 sys.exit(main())

-- 
To view, visit https://gerrit.asterisk.org/68
To unsubscribe, visit https://gerrit.asterisk.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I0ae337d24e3db7d552406a57a740d260d5c4d2d7
Gerrit-PatchSet: 1
Gerrit-Project: repotools
Gerrit-Branch: master
Gerrit-Owner: Matt Jordan 

-- 
_
-- Bandwidth and Colocation Provided by http://www.api-digital.com --

asterisk-dev mailing list
To UNSUBSCRIBE or update options visit:
   http://lists.digium.com/mailman/listinfo/asterisk-dev

[asterisk-dev] Change in asterisk[11]: Add .gitignore and .gitreview files

[Matt Jordan (Code Review)]

Matt Jordan has submitted this change and it was merged.

Change subject: Add .gitignore and .gitreview files
..


Add .gitignore and .gitreview files

Add the .gitignore and .gitreview files to the asterisk repo.

NB:  You can add local ignores to the .git/info/exclude file
without having to do a commit.

Common ignore patterns are in the top-level .gitignore file.
Subdirectory-specific ignore patterns are in their own .gitignore
files.

Change-Id: I2b7513fc9acf5d432cf9587c25faa9786af14abf
Tested-by: George Joseph
---
A .gitignore
A .gitreview
A addons/.gitignore
A agi/.gitignore
A build_tools/.gitignore
A doc/.gitignore
A include/asterisk/.gitignore
A main/.gitignore
A menuselect/.gitignore
A res/ael/.gitignore
A utils/.gitignore
11 files changed, 72 insertions(+), 0 deletions(-)

Approvals:
  Matt Jordan: Looks good to me, approved; Verified
  George Joseph: Looks good to me, but someone else must approve



diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000..cf46873
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,26 @@
+# git ls-files --others --exclude-from=.git/info/exclude
+# Lines that start with '#' are comments.
+# For a project mostly in C, the following would be a good set of
+# exclude patterns (uncomment them if you want to use them):
+# *.[oa]
+# *~
+
+# See .gitignore in subdirectories for more ignored files
+
+*~
+*.[oadi]
+*.ii
+*.oo
+*.eo
+*.so
+*.exports
+*.moduleinfo
+*.makeopts
+*.makedeps
+makeopts
+.lastclean
+config.log
+config.status
+defaults.h
+makeopts.embed_rules
+menuselect-tree
diff --git a/.gitreview b/.gitreview
new file mode 100644
index 000..f9ef050
--- /dev/null
+++ b/.gitreview
@@ -0,0 +1,4 @@
+[gerrit]
+host=gerrit.asterisk.org
+port=29418
+project=asterisk.git
diff --git a/addons/.gitignore b/addons/.gitignore
new file mode 100644
index 000..663e668
--- /dev/null
+++ b/addons/.gitignore
@@ -0,0 +1 @@
+mp3
diff --git a/agi/.gitignore b/agi/.gitignore
new file mode 100644
index 000..9b2a4e2
--- /dev/null
+++ b/agi/.gitignore
@@ -0,0 +1,3 @@
+eagi-sphinx-test
+eagi-test
+strcompat.c
diff --git a/build_tools/.gitignore b/build_tools/.gitignore
new file mode 100644
index 000..c60a0df
--- /dev/null
+++ b/build_tools/.gitignore
@@ -0,0 +1 @@
+menuselect-deps
diff --git a/doc/.gitignore b/doc/.gitignore
new file mode 100644
index 000..27acdb3
--- /dev/null
+++ b/doc/.gitignore
@@ -0,0 +1 @@
+core-en_US.xml
diff --git a/include/asterisk/.gitignore b/include/asterisk/.gitignore
new file mode 100644
index 000..ae33b3c
--- /dev/null
+++ b/include/asterisk/.gitignore
@@ -0,0 +1,3 @@
+autoconfig.h
+build.h
+buildopts.h
diff --git a/main/.gitignore b/main/.gitignore
new file mode 100644
index 000..23f5c58
--- /dev/null
+++ b/main/.gitignore
@@ -0,0 +1,3 @@
+asterisk
+libasteriskssl.so.1
+version.c
diff --git a/menuselect/.gitignore b/menuselect/.gitignore
new file mode 100644
index 000..38ea2d3
--- /dev/null
+++ b/menuselect/.gitignore
@@ -0,0 +1,5 @@
+autoconfig.h
+cmenuselect
+config.log
+config.status
+menuselect
diff --git a/res/ael/.gitignore b/res/ael/.gitignore
new file mode 100644
index 000..f39b612
--- /dev/null
+++ b/res/ael/.gitignore
@@ -0,0 +1 @@
+ael.output
diff --git a/utils/.gitignore b/utils/.gitignore
new file mode 100644
index 000..ed37a06
--- /dev/null
+++ b/utils/.gitignore
@@ -0,0 +1,24 @@
+aelbison.c
+aelparse
+aelparse.c
+ast_expr2.c
+ast_expr2f.c
+astman
+astcanary
+astdb2bdb
+astdb2sqlite3
+check_expr
+check_expr2
+conf2ael
+db1-ast/libdb1.a
+hashtab.c
+lock.c
+md5.c
+muted
+pbx_ael.c
+pval.c
+smsq
+stereorize
+strcompat.c
+streamplayer
+threadstorage.c

-- 
To view, visit https://gerrit.asterisk.org/64
To unsubscribe, visit https://gerrit.asterisk.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I2b7513fc9acf5d432cf9587c25faa9786af14abf
Gerrit-PatchSet: 1
Gerrit-Project: asterisk
Gerrit-Branch: 11
Gerrit-Owner: Matt Jordan 
Gerrit-Reviewer: George Joseph 
Gerrit-Reviewer: Matt Jordan 

-- 
_
-- Bandwidth and Colocation Provided by http://www.api-digital.com --

asterisk-dev mailing list
To UNSUBSCRIBE or update options visit:
   http://lists.digium.com/mailman/listinfo/asterisk-dev

[asterisk-dev] Change in asterisk[11]: .gitignore: Ignore tarballs (*.gz)

[Matt Jordan (Code Review)]

Matt Jordan has submitted this change and it was merged.

Change subject: .gitignore: Ignore tarballs (*.gz)
..


.gitignore: Ignore tarballs (*.gz)

This patch updates the root .gitignore file to ignore files with a .gz
extension. This will cause git to ignore downloaded sound tarballs in
the the sounds/ directory.

Change-Id: Ic153642236ea8aee100443b94c563d0318711af3
---
M .gitignore
1 file changed, 1 insertion(+), 0 deletions(-)

Approvals:
  Matt Jordan: Looks good to me, approved; Verified
  George Joseph: Looks good to me, but someone else must approve



diff --git a/.gitignore b/.gitignore
index cf46873..33dd7cc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,6 +9,7 @@
 
 *~
 *.[oadi]
+*.gz
 *.ii
 *.oo
 *.eo

-- 
To view, visit https://gerrit.asterisk.org/65
To unsubscribe, visit https://gerrit.asterisk.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ic153642236ea8aee100443b94c563d0318711af3
Gerrit-PatchSet: 1
Gerrit-Project: asterisk
Gerrit-Branch: 11
Gerrit-Owner: Matt Jordan 
Gerrit-Reviewer: George Joseph 
Gerrit-Reviewer: Matt Jordan 

-- 
_
-- Bandwidth and Colocation Provided by http://www.api-digital.com --

asterisk-dev mailing list
To UNSUBSCRIBE or update options visit:
   http://lists.digium.com/mailman/listinfo/asterisk-dev

[asterisk-dev] Change in asterisk[13]: Add .gitignore and .gitreview files

[Matt Jordan (Code Review)]

Matt Jordan has posted comments on this change.

Change subject: Add .gitignore and .gitreview files
..


Patch Set 1: Code-Review+2 Verified+1

-- 
To view, visit https://gerrit.asterisk.org/62
To unsubscribe, visit https://gerrit.asterisk.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I4c8af3b8e3739957db545f7368ac53f38e99f696
Gerrit-PatchSet: 1
Gerrit-Project: asterisk
Gerrit-Branch: 13
Gerrit-Owner: Matt Jordan 
Gerrit-Reviewer: George Joseph 
Gerrit-Reviewer: Matt Jordan 
Gerrit-HasComments: No

-- 
_
-- Bandwidth and Colocation Provided by http://www.api-digital.com --

asterisk-dev mailing list
To UNSUBSCRIBE or update options visit:
   http://lists.digium.com/mailman/listinfo/asterisk-dev

[asterisk-dev] Change in asterisk[13]: main/editline: Add .gitignore.

[Matt Jordan (Code Review)]

Matt Jordan has posted comments on this change.

Change subject: main/editline: Add .gitignore.
..


Patch Set 1: Code-Review+2 Verified+1

-- 
To view, visit https://gerrit.asterisk.org/66
To unsubscribe, visit https://gerrit.asterisk.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I68c7bf375ea46282689e5a706534b69fca233b5d
Gerrit-PatchSet: 1
Gerrit-Project: asterisk
Gerrit-Branch: 13
Gerrit-Owner: Matt Jordan 
Gerrit-Reviewer: Corey Farrell 
Gerrit-Reviewer: George Joseph 
Gerrit-Reviewer: Matt Jordan 
Gerrit-HasComments: No

-- 
_
-- Bandwidth and Colocation Provided by http://www.api-digital.com --

asterisk-dev mailing list
To UNSUBSCRIBE or update options visit:
   http://lists.digium.com/mailman/listinfo/asterisk-dev

[asterisk-dev] Change in asterisk[11]: Add .gitignore and .gitreview files

[Matt Jordan (Code Review)]

Matt Jordan has posted comments on this change.

Change subject: Add .gitignore and .gitreview files
..


Patch Set 1: Code-Review+2 Verified+1

-- 
To view, visit https://gerrit.asterisk.org/64
To unsubscribe, visit https://gerrit.asterisk.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I2b7513fc9acf5d432cf9587c25faa9786af14abf
Gerrit-PatchSet: 1
Gerrit-Project: asterisk
Gerrit-Branch: 11
Gerrit-Owner: Matt Jordan 
Gerrit-Reviewer: George Joseph 
Gerrit-Reviewer: Matt Jordan 
Gerrit-HasComments: No

-- 
_
-- Bandwidth and Colocation Provided by http://www.api-digital.com --

asterisk-dev mailing list
To UNSUBSCRIBE or update options visit:
   http://lists.digium.com/mailman/listinfo/asterisk-dev

[asterisk-dev] Change in asterisk[11]: main/editline: Add .gitignore.

[Matt Jordan (Code Review)]

Matt Jordan has posted comments on this change.

Change subject: main/editline: Add .gitignore.
..


Patch Set 1: Code-Review+2

-- 
To view, visit https://gerrit.asterisk.org/67
To unsubscribe, visit https://gerrit.asterisk.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I68c7bf375ea46282689e5a706534b69fca233b5d
Gerrit-PatchSet: 1
Gerrit-Project: asterisk
Gerrit-Branch: 11
Gerrit-Owner: Matt Jordan 
Gerrit-Reviewer: Corey Farrell 
Gerrit-Reviewer: George Joseph 
Gerrit-Reviewer: Matt Jordan 
Gerrit-HasComments: No

-- 
_
-- Bandwidth and Colocation Provided by http://www.api-digital.com --

asterisk-dev mailing list
To UNSUBSCRIBE or update options visit:
   http://lists.digium.com/mailman/listinfo/asterisk-dev

[asterisk-dev] Change in asterisk[13]: .gitignore: Ignore tarballs (*.gz)

[Matt Jordan (Code Review)]

Matt Jordan has submitted this change and it was merged.

Change subject: .gitignore: Ignore tarballs (*.gz)
..


.gitignore: Ignore tarballs (*.gz)

This patch updates the root .gitignore file to ignore files with a .gz
extension. This will cause git to ignore downloaded sound tarballs in
the the sounds/ directory.

Change-Id: I1e42fbfa02a8884231507b683e8e49ac3e278aaa
---
M .gitignore
1 file changed, 1 insertion(+), 0 deletions(-)

Approvals:
  Matt Jordan: Looks good to me, approved; Verified
  George Joseph: Looks good to me, but someone else must approve



diff --git a/.gitignore b/.gitignore
index cf46873..33dd7cc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,6 +9,7 @@
 
 *~
 *.[oadi]
+*.gz
 *.ii
 *.oo
 *.eo

-- 
To view, visit https://gerrit.asterisk.org/63
To unsubscribe, visit https://gerrit.asterisk.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I1e42fbfa02a8884231507b683e8e49ac3e278aaa
Gerrit-PatchSet: 1
Gerrit-Project: asterisk
Gerrit-Branch: 13
Gerrit-Owner: Matt Jordan 
Gerrit-Reviewer: George Joseph 
Gerrit-Reviewer: Matt Jordan 

-- 
_
-- Bandwidth and Colocation Provided by http://www.api-digital.com --

asterisk-dev mailing list
To UNSUBSCRIBE or update options visit:
   http://lists.digium.com/mailman/listinfo/asterisk-dev

[asterisk-dev] Change in asterisk[13]: main/editline: Add .gitignore.

[Matt Jordan (Code Review)]

Matt Jordan has submitted this change and it was merged.

Change subject: main/editline: Add .gitignore.
..


main/editline: Add .gitignore.

This patch adds a .gitignore for main/editline to ignore all build results.

Change-Id: I68c7bf375ea46282689e5a706534b69fca233b5d
---
A main/editline/.gitignore
1 file changed, 13 insertions(+), 0 deletions(-)

Approvals:
  Matt Jordan: Looks good to me, approved; Verified
  George Joseph: Looks good to me, but someone else must approve



diff --git a/main/editline/.gitignore b/main/editline/.gitignore
new file mode 100644
index 000..d3bb06b
--- /dev/null
+++ b/main/editline/.gitignore
@@ -0,0 +1,13 @@
+*.o_a
+Makefile
+common.h
+config.cache
+config.h
+editline.c
+emacs.h
+fcns.c
+fcns.h
+help.c
+help.h
+makelist
+vi.h

-- 
To view, visit https://gerrit.asterisk.org/66
To unsubscribe, visit https://gerrit.asterisk.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I68c7bf375ea46282689e5a706534b69fca233b5d
Gerrit-PatchSet: 1
Gerrit-Project: asterisk
Gerrit-Branch: 13
Gerrit-Owner: Matt Jordan 
Gerrit-Reviewer: George Joseph 
Gerrit-Reviewer: Matt Jordan 

-- 
_
-- Bandwidth and Colocation Provided by http://www.api-digital.com --

asterisk-dev mailing list
To UNSUBSCRIBE or update options visit:
   http://lists.digium.com/mailman/listinfo/asterisk-dev

[asterisk-dev] Change in asterisk[13]: .gitignore: Ignore tarballs (*.gz)

[Matt Jordan (Code Review)]

Matt Jordan has posted comments on this change.

Change subject: .gitignore: Ignore tarballs (*.gz)
..


Patch Set 1: Code-Review+2 Verified+1

-- 
To view, visit https://gerrit.asterisk.org/63
To unsubscribe, visit https://gerrit.asterisk.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I1e42fbfa02a8884231507b683e8e49ac3e278aaa
Gerrit-PatchSet: 1
Gerrit-Project: asterisk
Gerrit-Branch: 13
Gerrit-Owner: Matt Jordan 
Gerrit-Reviewer: George Joseph 
Gerrit-Reviewer: Matt Jordan 
Gerrit-HasComments: No

-- 
_
-- Bandwidth and Colocation Provided by http://www.api-digital.com --

asterisk-dev mailing list
To UNSUBSCRIBE or update options visit:
   http://lists.digium.com/mailman/listinfo/asterisk-dev

[asterisk-dev] Change in asterisk[13]: Add .gitignore and .gitreview files

[Matt Jordan (Code Review)]

Matt Jordan has submitted this change and it was merged.

Change subject: Add .gitignore and .gitreview files
..


Add .gitignore and .gitreview files

Add the .gitignore and .gitreview files to the asterisk repo.

NB:  You can add local ignores to the .git/info/exclude file
without having to do a commit.

Common ignore patterns are in the top-level .gitignore file.
Subdirectory-specific ignore patterns are in their own .gitignore
files.

Change-Id: I4c8af3b8e3739957db545f7368ac53f38e99f696
Tested-by: George Joseph
---
A .gitignore
A .gitreview
A addons/.gitignore
A agi/.gitignore
A build_tools/.gitignore
A doc/.gitignore
A include/asterisk/.gitignore
A main/.gitignore
A menuselect/.gitignore
A res/ael/.gitignore
A utils/.gitignore
11 files changed, 72 insertions(+), 0 deletions(-)

Approvals:
  Matt Jordan: Looks good to me, approved; Verified
  George Joseph: Looks good to me, but someone else must approve



diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000..cf46873
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,26 @@
+# git ls-files --others --exclude-from=.git/info/exclude
+# Lines that start with '#' are comments.
+# For a project mostly in C, the following would be a good set of
+# exclude patterns (uncomment them if you want to use them):
+# *.[oa]
+# *~
+
+# See .gitignore in subdirectories for more ignored files
+
+*~
+*.[oadi]
+*.ii
+*.oo
+*.eo
+*.so
+*.exports
+*.moduleinfo
+*.makeopts
+*.makedeps
+makeopts
+.lastclean
+config.log
+config.status
+defaults.h
+makeopts.embed_rules
+menuselect-tree
diff --git a/.gitreview b/.gitreview
new file mode 100644
index 000..f9ef050
--- /dev/null
+++ b/.gitreview
@@ -0,0 +1,4 @@
+[gerrit]
+host=gerrit.asterisk.org
+port=29418
+project=asterisk.git
diff --git a/addons/.gitignore b/addons/.gitignore
new file mode 100644
index 000..663e668
--- /dev/null
+++ b/addons/.gitignore
@@ -0,0 +1 @@
+mp3
diff --git a/agi/.gitignore b/agi/.gitignore
new file mode 100644
index 000..9b2a4e2
--- /dev/null
+++ b/agi/.gitignore
@@ -0,0 +1,3 @@
+eagi-sphinx-test
+eagi-test
+strcompat.c
diff --git a/build_tools/.gitignore b/build_tools/.gitignore
new file mode 100644
index 000..c60a0df
--- /dev/null
+++ b/build_tools/.gitignore
@@ -0,0 +1 @@
+menuselect-deps
diff --git a/doc/.gitignore b/doc/.gitignore
new file mode 100644
index 000..27acdb3
--- /dev/null
+++ b/doc/.gitignore
@@ -0,0 +1 @@
+core-en_US.xml
diff --git a/include/asterisk/.gitignore b/include/asterisk/.gitignore
new file mode 100644
index 000..ae33b3c
--- /dev/null
+++ b/include/asterisk/.gitignore
@@ -0,0 +1,3 @@
+autoconfig.h
+build.h
+buildopts.h
diff --git a/main/.gitignore b/main/.gitignore
new file mode 100644
index 000..23f5c58
--- /dev/null
+++ b/main/.gitignore
@@ -0,0 +1,3 @@
+asterisk
+libasteriskssl.so.1
+version.c
diff --git a/menuselect/.gitignore b/menuselect/.gitignore
new file mode 100644
index 000..38ea2d3
--- /dev/null
+++ b/menuselect/.gitignore
@@ -0,0 +1,5 @@
+autoconfig.h
+cmenuselect
+config.log
+config.status
+menuselect
diff --git a/res/ael/.gitignore b/res/ael/.gitignore
new file mode 100644
index 000..f39b612
--- /dev/null
+++ b/res/ael/.gitignore
@@ -0,0 +1 @@
+ael.output
diff --git a/utils/.gitignore b/utils/.gitignore
new file mode 100644
index 000..ed37a06
--- /dev/null
+++ b/utils/.gitignore
@@ -0,0 +1,24 @@
+aelbison.c
+aelparse
+aelparse.c
+ast_expr2.c
+ast_expr2f.c
+astman
+astcanary
+astdb2bdb
+astdb2sqlite3
+check_expr
+check_expr2
+conf2ael
+db1-ast/libdb1.a
+hashtab.c
+lock.c
+md5.c
+muted
+pbx_ael.c
+pval.c
+smsq
+stereorize
+strcompat.c
+streamplayer
+threadstorage.c

-- 
To view, visit https://gerrit.asterisk.org/62
To unsubscribe, visit https://gerrit.asterisk.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I4c8af3b8e3739957db545f7368ac53f38e99f696
Gerrit-PatchSet: 1
Gerrit-Project: asterisk
Gerrit-Branch: 13
Gerrit-Owner: Matt Jordan 
Gerrit-Reviewer: George Joseph 
Gerrit-Reviewer: Matt Jordan 

-- 
_
-- Bandwidth and Colocation Provided by http://www.api-digital.com --

asterisk-dev mailing list
To UNSUBSCRIBE or update options visit:
   http://lists.digium.com/mailman/listinfo/asterisk-dev

[asterisk-dev] Change in asterisk[11]: main/editline: Add .gitignore.

[Matt Jordan (Code Review)]

Matt Jordan has submitted this change and it was merged.

Change subject: main/editline: Add .gitignore.
..


main/editline: Add .gitignore.

This patch adds a .gitignore for main/editline to ignore all build results.

Change-Id: I68c7bf375ea46282689e5a706534b69fca233b5d
---
A main/editline/.gitignore
1 file changed, 13 insertions(+), 0 deletions(-)

Approvals:
  Matt Jordan: Looks good to me, approved; Verified
  George Joseph: Looks good to me, but someone else must approve



diff --git a/main/editline/.gitignore b/main/editline/.gitignore
new file mode 100644
index 000..d3bb06b
--- /dev/null
+++ b/main/editline/.gitignore
@@ -0,0 +1,13 @@
+*.o_a
+Makefile
+common.h
+config.cache
+config.h
+editline.c
+emacs.h
+fcns.c
+fcns.h
+help.c
+help.h
+makelist
+vi.h

-- 
To view, visit https://gerrit.asterisk.org/67
To unsubscribe, visit https://gerrit.asterisk.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I68c7bf375ea46282689e5a706534b69fca233b5d
Gerrit-PatchSet: 1
Gerrit-Project: asterisk
Gerrit-Branch: 11
Gerrit-Owner: Matt Jordan 
Gerrit-Reviewer: George Joseph 
Gerrit-Reviewer: Matt Jordan 

-- 
_
-- Bandwidth and Colocation Provided by http://www.api-digital.com --

asterisk-dev mailing list
To UNSUBSCRIBE or update options visit:
   http://lists.digium.com/mailman/listinfo/asterisk-dev

[asterisk-dev] Change in asterisk[11]: .gitignore: Ignore tarballs (*.gz)

[Matt Jordan (Code Review)]

Matt Jordan has posted comments on this change.

Change subject: .gitignore: Ignore tarballs (*.gz)
..


Patch Set 1: Code-Review+2 Verified+1

-- 
To view, visit https://gerrit.asterisk.org/65
To unsubscribe, visit https://gerrit.asterisk.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: Ic153642236ea8aee100443b94c563d0318711af3
Gerrit-PatchSet: 1
Gerrit-Project: asterisk
Gerrit-Branch: 11
Gerrit-Owner: Matt Jordan 
Gerrit-Reviewer: George Joseph 
Gerrit-Reviewer: Matt Jordan 
Gerrit-HasComments: No

-- 
_
-- Bandwidth and Colocation Provided by http://www.api-digital.com --

asterisk-dev mailing list
To UNSUBSCRIBE or update options visit:
   http://lists.digium.com/mailman/listinfo/asterisk-dev

[asterisk-dev] Change in asterisk[11]: main/editline: Add .gitignore.

[Matt Jordan (Code Review)]

Matt Jordan has posted comments on this change.

Change subject: main/editline: Add .gitignore.
..


Patch Set 1: Verified+1

-- 
To view, visit https://gerrit.asterisk.org/67
To unsubscribe, visit https://gerrit.asterisk.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I68c7bf375ea46282689e5a706534b69fca233b5d
Gerrit-PatchSet: 1
Gerrit-Project: asterisk
Gerrit-Branch: 11
Gerrit-Owner: Matt Jordan 
Gerrit-Reviewer: Corey Farrell 
Gerrit-Reviewer: George Joseph 
Gerrit-Reviewer: Matt Jordan 
Gerrit-HasComments: No

-- 
_
-- Bandwidth and Colocation Provided by http://www.api-digital.com --

asterisk-dev mailing list
To UNSUBSCRIBE or update options visit:
   http://lists.digium.com/mailman/listinfo/asterisk-dev

[asterisk-dev] Change in testsuite[master]: PEP8 fixes

[Matt Jordan (Code Review)]

Matt Jordan has posted comments on this change.

Change subject: PEP8 fixes
..


Patch Set 1: Code-Review+1

-- 
To view, visit https://gerrit.asterisk.org/40
To unsubscribe, visit https://gerrit.asterisk.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I55bcaab21c54f9040594f51c57f0efe30a219a62
Gerrit-PatchSet: 1
Gerrit-Project: testsuite
Gerrit-Branch: master
Gerrit-Owner: Corey Farrell 
Gerrit-Reviewer: Matt Jordan 
Gerrit-HasComments: No

-- 
_
-- Bandwidth and Colocation Provided by http://www.api-digital.com --

asterisk-dev mailing list
To UNSUBSCRIBE or update options visit:
   http://lists.digium.com/mailman/listinfo/asterisk-dev

[asterisk-dev] Change in asterisk[11]: main/editline: Add .gitignore.

[Matt Jordan (Code Review)]

Matt Jordan has uploaded a new change for review.

  https://gerrit.asterisk.org/67

Change subject: main/editline: Add .gitignore.
..

main/editline: Add .gitignore.

This patch adds a .gitignore for main/editline to ignore all build results.

Change-Id: I68c7bf375ea46282689e5a706534b69fca233b5d
---
A main/editline/.gitignore
1 file changed, 13 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.asterisk.org:29418/asterisk refs/changes/67/67/1

diff --git a/main/editline/.gitignore b/main/editline/.gitignore
new file mode 100644
index 000..d3bb06b
--- /dev/null
+++ b/main/editline/.gitignore
@@ -0,0 +1,13 @@
+*.o_a
+Makefile
+common.h
+config.cache
+config.h
+editline.c
+emacs.h
+fcns.c
+fcns.h
+help.c
+help.h
+makelist
+vi.h

-- 
To view, visit https://gerrit.asterisk.org/67
To unsubscribe, visit https://gerrit.asterisk.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I68c7bf375ea46282689e5a706534b69fca233b5d
Gerrit-PatchSet: 1
Gerrit-Project: asterisk
Gerrit-Branch: 11
Gerrit-Owner: Matt Jordan 
Gerrit-Reviewer: Corey Farrell 

-- 
_
-- Bandwidth and Colocation Provided by http://www.api-digital.com --

asterisk-dev mailing list
To UNSUBSCRIBE or update options visit:
   http://lists.digium.com/mailman/listinfo/asterisk-dev

[asterisk-dev] Change in asterisk[13]: main/editline: Add .gitignore.

[Matt Jordan (Code Review)]

Matt Jordan has uploaded a new change for review.

  https://gerrit.asterisk.org/66

Change subject: main/editline: Add .gitignore.
..

main/editline: Add .gitignore.

This patch adds a .gitignore for main/editline to ignore all build results.

Change-Id: I68c7bf375ea46282689e5a706534b69fca233b5d
---
A main/editline/.gitignore
1 file changed, 13 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.asterisk.org:29418/asterisk refs/changes/66/66/1

diff --git a/main/editline/.gitignore b/main/editline/.gitignore
new file mode 100644
index 000..d3bb06b
--- /dev/null
+++ b/main/editline/.gitignore
@@ -0,0 +1,13 @@
+*.o_a
+Makefile
+common.h
+config.cache
+config.h
+editline.c
+emacs.h
+fcns.c
+fcns.h
+help.c
+help.h
+makelist
+vi.h

-- 
To view, visit https://gerrit.asterisk.org/66
To unsubscribe, visit https://gerrit.asterisk.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I68c7bf375ea46282689e5a706534b69fca233b5d
Gerrit-PatchSet: 1
Gerrit-Project: asterisk
Gerrit-Branch: 13
Gerrit-Owner: Matt Jordan 
Gerrit-Reviewer: Corey Farrell 

-- 
_
-- Bandwidth and Colocation Provided by http://www.api-digital.com --

asterisk-dev mailing list
To UNSUBSCRIBE or update options visit:
   http://lists.digium.com/mailman/listinfo/asterisk-dev

[asterisk-dev] Change in asterisk[master]: main/editline: Add .gitignore.

[Matt Jordan (Code Review)]

Matt Jordan has posted comments on this change.

Change subject: main/editline: Add .gitignore.
..


Patch Set 1: Code-Review+2 Verified+1

-- 
To view, visit https://gerrit.asterisk.org/57
To unsubscribe, visit https://gerrit.asterisk.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I68c7bf375ea46282689e5a706534b69fca233b5d
Gerrit-PatchSet: 1
Gerrit-Project: asterisk
Gerrit-Branch: master
Gerrit-Owner: Corey Farrell 
Gerrit-Reviewer: George Joseph 
Gerrit-Reviewer: Matt Jordan 
Gerrit-Reviewer: Tzafrir Cohen 
Gerrit-HasComments: No

-- 
_
-- Bandwidth and Colocation Provided by http://www.api-digital.com --

asterisk-dev mailing list
To UNSUBSCRIBE or update options visit:
   http://lists.digium.com/mailman/listinfo/asterisk-dev

[asterisk-dev] Change in asterisk[master]: main/editline: Add .gitignore.

[Matt Jordan (Code Review)]

Matt Jordan has submitted this change and it was merged.

Change subject: main/editline: Add .gitignore.
..


main/editline: Add .gitignore.

This patch adds a .gitignore for main/editline to ignore all build results.

Change-Id: I68c7bf375ea46282689e5a706534b69fca233b5d
---
A main/editline/.gitignore
1 file changed, 13 insertions(+), 0 deletions(-)

Approvals:
  Matt Jordan: Looks good to me, approved; Verified
  George Joseph: Looks good to me, but someone else must approve



diff --git a/main/editline/.gitignore b/main/editline/.gitignore
new file mode 100644
index 000..d3bb06b
--- /dev/null
+++ b/main/editline/.gitignore
@@ -0,0 +1,13 @@
+*.o_a
+Makefile
+common.h
+config.cache
+config.h
+editline.c
+emacs.h
+fcns.c
+fcns.h
+help.c
+help.h
+makelist
+vi.h

-- 
To view, visit https://gerrit.asterisk.org/57
To unsubscribe, visit https://gerrit.asterisk.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I68c7bf375ea46282689e5a706534b69fca233b5d
Gerrit-PatchSet: 1
Gerrit-Project: asterisk
Gerrit-Branch: master
Gerrit-Owner: Corey Farrell 
Gerrit-Reviewer: George Joseph 
Gerrit-Reviewer: Matt Jordan 
Gerrit-Reviewer: Tzafrir Cohen 

-- 
_
-- Bandwidth and Colocation Provided by http://www.api-digital.com --

asterisk-dev mailing list
To UNSUBSCRIBE or update options visit:
   http://lists.digium.com/mailman/listinfo/asterisk-dev

[asterisk-dev] Change in asterisk[11]: Add .gitignore and .gitreview files

[Matt Jordan (Code Review)]

Hello George Joseph,

I'd like you to do a code review.  Please visit

https://gerrit.asterisk.org/64

to review the following change.

Change subject: Add .gitignore and .gitreview files
..

Add .gitignore and .gitreview files

Add the .gitignore and .gitreview files to the asterisk repo.

NB:  You can add local ignores to the .git/info/exclude file
without having to do a commit.

Common ignore patterns are in the top-level .gitignore file.
Subdirectory-specific ignore patterns are in their own .gitignore
files.

Change-Id: I2b7513fc9acf5d432cf9587c25faa9786af14abf
Tested-by: George Joseph
---
A .gitignore
A .gitreview
A addons/.gitignore
A agi/.gitignore
A build_tools/.gitignore
A doc/.gitignore
A include/asterisk/.gitignore
A main/.gitignore
A menuselect/.gitignore
A res/ael/.gitignore
A utils/.gitignore
11 files changed, 72 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.asterisk.org:29418/asterisk refs/changes/64/64/1

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000..cf46873
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,26 @@
+# git ls-files --others --exclude-from=.git/info/exclude
+# Lines that start with '#' are comments.
+# For a project mostly in C, the following would be a good set of
+# exclude patterns (uncomment them if you want to use them):
+# *.[oa]
+# *~
+
+# See .gitignore in subdirectories for more ignored files
+
+*~
+*.[oadi]
+*.ii
+*.oo
+*.eo
+*.so
+*.exports
+*.moduleinfo
+*.makeopts
+*.makedeps
+makeopts
+.lastclean
+config.log
+config.status
+defaults.h
+makeopts.embed_rules
+menuselect-tree
diff --git a/.gitreview b/.gitreview
new file mode 100644
index 000..f9ef050
--- /dev/null
+++ b/.gitreview
@@ -0,0 +1,4 @@
+[gerrit]
+host=gerrit.asterisk.org
+port=29418
+project=asterisk.git
diff --git a/addons/.gitignore b/addons/.gitignore
new file mode 100644
index 000..663e668
--- /dev/null
+++ b/addons/.gitignore
@@ -0,0 +1 @@
+mp3
diff --git a/agi/.gitignore b/agi/.gitignore
new file mode 100644
index 000..9b2a4e2
--- /dev/null
+++ b/agi/.gitignore
@@ -0,0 +1,3 @@
+eagi-sphinx-test
+eagi-test
+strcompat.c
diff --git a/build_tools/.gitignore b/build_tools/.gitignore
new file mode 100644
index 000..c60a0df
--- /dev/null
+++ b/build_tools/.gitignore
@@ -0,0 +1 @@
+menuselect-deps
diff --git a/doc/.gitignore b/doc/.gitignore
new file mode 100644
index 000..27acdb3
--- /dev/null
+++ b/doc/.gitignore
@@ -0,0 +1 @@
+core-en_US.xml
diff --git a/include/asterisk/.gitignore b/include/asterisk/.gitignore
new file mode 100644
index 000..ae33b3c
--- /dev/null
+++ b/include/asterisk/.gitignore
@@ -0,0 +1,3 @@
+autoconfig.h
+build.h
+buildopts.h
diff --git a/main/.gitignore b/main/.gitignore
new file mode 100644
index 000..23f5c58
--- /dev/null
+++ b/main/.gitignore
@@ -0,0 +1,3 @@
+asterisk
+libasteriskssl.so.1
+version.c
diff --git a/menuselect/.gitignore b/menuselect/.gitignore
new file mode 100644
index 000..38ea2d3
--- /dev/null
+++ b/menuselect/.gitignore
@@ -0,0 +1,5 @@
+autoconfig.h
+cmenuselect
+config.log
+config.status
+menuselect
diff --git a/res/ael/.gitignore b/res/ael/.gitignore
new file mode 100644
index 000..f39b612
--- /dev/null
+++ b/res/ael/.gitignore
@@ -0,0 +1 @@
+ael.output
diff --git a/utils/.gitignore b/utils/.gitignore
new file mode 100644
index 000..ed37a06
--- /dev/null
+++ b/utils/.gitignore
@@ -0,0 +1,24 @@
+aelbison.c
+aelparse
+aelparse.c
+ast_expr2.c
+ast_expr2f.c
+astman
+astcanary
+astdb2bdb
+astdb2sqlite3
+check_expr
+check_expr2
+conf2ael
+db1-ast/libdb1.a
+hashtab.c
+lock.c
+md5.c
+muted
+pbx_ael.c
+pval.c
+smsq
+stereorize
+strcompat.c
+streamplayer
+threadstorage.c

-- 
To view, visit https://gerrit.asterisk.org/64
To unsubscribe, visit https://gerrit.asterisk.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I2b7513fc9acf5d432cf9587c25faa9786af14abf
Gerrit-PatchSet: 1
Gerrit-Project: asterisk
Gerrit-Branch: 11
Gerrit-Owner: Matt Jordan 
Gerrit-Reviewer: George Joseph 

-- 
_
-- Bandwidth and Colocation Provided by http://www.api-digital.com --

asterisk-dev mailing list
To UNSUBSCRIBE or update options visit:
   http://lists.digium.com/mailman/listinfo/asterisk-dev

[asterisk-dev] Change in asterisk[11]: .gitignore: Ignore tarballs (*.gz)

[Matt Jordan (Code Review)]

Matt Jordan has uploaded a new change for review.

  https://gerrit.asterisk.org/65

Change subject: .gitignore: Ignore tarballs (*.gz)
..

.gitignore: Ignore tarballs (*.gz)

This patch updates the root .gitignore file to ignore files with a .gz
extension. This will cause git to ignore downloaded sound tarballs in
the the sounds/ directory.

Change-Id: Ic153642236ea8aee100443b94c563d0318711af3
---
M .gitignore
1 file changed, 1 insertion(+), 0 deletions(-)


  git pull ssh://gerrit.asterisk.org:29418/asterisk refs/changes/65/65/1

diff --git a/.gitignore b/.gitignore
index cf46873..33dd7cc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,6 +9,7 @@
 
 *~
 *.[oadi]
+*.gz
 *.ii
 *.oo
 *.eo

-- 
To view, visit https://gerrit.asterisk.org/65
To unsubscribe, visit https://gerrit.asterisk.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic153642236ea8aee100443b94c563d0318711af3
Gerrit-PatchSet: 1
Gerrit-Project: asterisk
Gerrit-Branch: 11
Gerrit-Owner: Matt Jordan 

-- 
_
-- Bandwidth and Colocation Provided by http://www.api-digital.com --

asterisk-dev mailing list
To UNSUBSCRIBE or update options visit:
   http://lists.digium.com/mailman/listinfo/asterisk-dev

[asterisk-dev] Change in asterisk[13]: Add .gitignore and .gitreview files

[Matt Jordan (Code Review)]

Hello George Joseph,

I'd like you to do a code review.  Please visit

https://gerrit.asterisk.org/62

to review the following change.

Change subject: Add .gitignore and .gitreview files
..

Add .gitignore and .gitreview files

Add the .gitignore and .gitreview files to the asterisk repo.

NB:  You can add local ignores to the .git/info/exclude file
without having to do a commit.

Common ignore patterns are in the top-level .gitignore file.
Subdirectory-specific ignore patterns are in their own .gitignore
files.

Change-Id: I4c8af3b8e3739957db545f7368ac53f38e99f696
Tested-by: George Joseph
---
A .gitignore
A .gitreview
A addons/.gitignore
A agi/.gitignore
A build_tools/.gitignore
A doc/.gitignore
A include/asterisk/.gitignore
A main/.gitignore
A menuselect/.gitignore
A res/ael/.gitignore
A utils/.gitignore
11 files changed, 72 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.asterisk.org:29418/asterisk refs/changes/62/62/1

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000..cf46873
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,26 @@
+# git ls-files --others --exclude-from=.git/info/exclude
+# Lines that start with '#' are comments.
+# For a project mostly in C, the following would be a good set of
+# exclude patterns (uncomment them if you want to use them):
+# *.[oa]
+# *~
+
+# See .gitignore in subdirectories for more ignored files
+
+*~
+*.[oadi]
+*.ii
+*.oo
+*.eo
+*.so
+*.exports
+*.moduleinfo
+*.makeopts
+*.makedeps
+makeopts
+.lastclean
+config.log
+config.status
+defaults.h
+makeopts.embed_rules
+menuselect-tree
diff --git a/.gitreview b/.gitreview
new file mode 100644
index 000..f9ef050
--- /dev/null
+++ b/.gitreview
@@ -0,0 +1,4 @@
+[gerrit]
+host=gerrit.asterisk.org
+port=29418
+project=asterisk.git
diff --git a/addons/.gitignore b/addons/.gitignore
new file mode 100644
index 000..663e668
--- /dev/null
+++ b/addons/.gitignore
@@ -0,0 +1 @@
+mp3
diff --git a/agi/.gitignore b/agi/.gitignore
new file mode 100644
index 000..9b2a4e2
--- /dev/null
+++ b/agi/.gitignore
@@ -0,0 +1,3 @@
+eagi-sphinx-test
+eagi-test
+strcompat.c
diff --git a/build_tools/.gitignore b/build_tools/.gitignore
new file mode 100644
index 000..c60a0df
--- /dev/null
+++ b/build_tools/.gitignore
@@ -0,0 +1 @@
+menuselect-deps
diff --git a/doc/.gitignore b/doc/.gitignore
new file mode 100644
index 000..27acdb3
--- /dev/null
+++ b/doc/.gitignore
@@ -0,0 +1 @@
+core-en_US.xml
diff --git a/include/asterisk/.gitignore b/include/asterisk/.gitignore
new file mode 100644
index 000..ae33b3c
--- /dev/null
+++ b/include/asterisk/.gitignore
@@ -0,0 +1,3 @@
+autoconfig.h
+build.h
+buildopts.h
diff --git a/main/.gitignore b/main/.gitignore
new file mode 100644
index 000..23f5c58
--- /dev/null
+++ b/main/.gitignore
@@ -0,0 +1,3 @@
+asterisk
+libasteriskssl.so.1
+version.c
diff --git a/menuselect/.gitignore b/menuselect/.gitignore
new file mode 100644
index 000..38ea2d3
--- /dev/null
+++ b/menuselect/.gitignore
@@ -0,0 +1,5 @@
+autoconfig.h
+cmenuselect
+config.log
+config.status
+menuselect
diff --git a/res/ael/.gitignore b/res/ael/.gitignore
new file mode 100644
index 000..f39b612
--- /dev/null
+++ b/res/ael/.gitignore
@@ -0,0 +1 @@
+ael.output
diff --git a/utils/.gitignore b/utils/.gitignore
new file mode 100644
index 000..ed37a06
--- /dev/null
+++ b/utils/.gitignore
@@ -0,0 +1,24 @@
+aelbison.c
+aelparse
+aelparse.c
+ast_expr2.c
+ast_expr2f.c
+astman
+astcanary
+astdb2bdb
+astdb2sqlite3
+check_expr
+check_expr2
+conf2ael
+db1-ast/libdb1.a
+hashtab.c
+lock.c
+md5.c
+muted
+pbx_ael.c
+pval.c
+smsq
+stereorize
+strcompat.c
+streamplayer
+threadstorage.c

-- 
To view, visit https://gerrit.asterisk.org/62
To unsubscribe, visit https://gerrit.asterisk.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I4c8af3b8e3739957db545f7368ac53f38e99f696
Gerrit-PatchSet: 1
Gerrit-Project: asterisk
Gerrit-Branch: 13
Gerrit-Owner: Matt Jordan 
Gerrit-Reviewer: George Joseph 

-- 
_
-- Bandwidth and Colocation Provided by http://www.api-digital.com --

asterisk-dev mailing list
To UNSUBSCRIBE or update options visit:
   http://lists.digium.com/mailman/listinfo/asterisk-dev

[asterisk-dev] Change in asterisk[13]: .gitignore: Ignore tarballs (*.gz)

[Matt Jordan (Code Review)]

Matt Jordan has uploaded a new change for review.

  https://gerrit.asterisk.org/63

Change subject: .gitignore: Ignore tarballs (*.gz)
..

.gitignore: Ignore tarballs (*.gz)

This patch updates the root .gitignore file to ignore files with a .gz
extension. This will cause git to ignore downloaded sound tarballs in
the the sounds/ directory.

Change-Id: I1e42fbfa02a8884231507b683e8e49ac3e278aaa
---
M .gitignore
1 file changed, 1 insertion(+), 0 deletions(-)


  git pull ssh://gerrit.asterisk.org:29418/asterisk refs/changes/63/63/1

diff --git a/.gitignore b/.gitignore
index cf46873..33dd7cc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,6 +9,7 @@
 
 *~
 *.[oadi]
+*.gz
 *.ii
 *.oo
 *.eo

-- 
To view, visit https://gerrit.asterisk.org/63
To unsubscribe, visit https://gerrit.asterisk.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I1e42fbfa02a8884231507b683e8e49ac3e278aaa
Gerrit-PatchSet: 1
Gerrit-Project: asterisk
Gerrit-Branch: 13
Gerrit-Owner: Matt Jordan 

-- 
_
-- Bandwidth and Colocation Provided by http://www.api-digital.com --

asterisk-dev mailing list
To UNSUBSCRIBE or update options visit:
   http://lists.digium.com/mailman/listinfo/asterisk-dev

[asterisk-dev] Change in asterisk[11]: git migration: Remove support for file versions

[Matt Jordan (Code Review)]

Matt Jordan has uploaded a new change for review.

  https://gerrit.asterisk.org/61

Change subject: git migration: Remove support for file versions
..

git migration: Remove support for file versions

Git does not support the ability to replace a token with a version
string during check-in. While it does have support for replacing a
token on clone, this is somewhat sub-optimal: the token is replaced
with the object hash, which is not particularly easy for human
consumption. What's more, in practice, the source file version was often
not terribly useful. Generally, when triaging bugs, the overall version
of Asterisk is far more useful than an individual SVN version of a file.
As a result, this patch removes Asterisk's support for showing source file
versions.

Specifically, it does the following:
* main/asterisk:
  - Refactor the file_version structure to reflect that it no longer
tracks a version field.
  - Remove the "core show file version" CLI command. Without the
file version, it is no longer useful.

* main/manager: Remove value from the Version key of the ModuleCheck
  Action. The actual key itself has not been removed, as doing so would
  absolutely constitute a backwards incompatible change. However, since
  the file version is no longer tracked, there is no need to attempt
  to include it in the Version key.

* UPGRADE: Add notes for:
  - Modification to the ModuleCheck AMI Action
  - Removal of the "core show file version" CLI command

Change-Id: Ia932d3c64cd18a14a3c894109baa657ec0a85d28
---
M UPGRADE.txt
M include/asterisk.h
M main/asterisk.c
M main/manager.c
4 files changed, 52 insertions(+), 132 deletions(-)


  git pull ssh://gerrit.asterisk.org:29418/asterisk refs/changes/61/61/1

diff --git a/UPGRADE.txt b/UPGRADE.txt
index 9f0906c..e5da94f 100644
--- a/UPGRADE.txt
+++ b/UPGRADE.txt
@@ -21,6 +21,16 @@
 ===
 
 from 11.16 to 11.17
+
+AMI:
+ - The 'ModuleCheck' Action's Version key will no longer show the module
+   version. The value will always be blank.
+
+CLI:
+ - The 'core show file version' command has been removed. When Asterisk
+   moved to Git, the source control version support was removed. As a
+   result, the CLi command was no longer useful and was removed as well.
+
 chan_dahdi:
  - For users using the FXO port (FXS signaling) distinctive ring detection
feature, you will need to adjust the dringX count values.  The count
diff --git a/include/asterisk.h b/include/asterisk.h
index 0ba913c..a7c1f5d 100644
--- a/include/asterisk.h
+++ b/include/asterisk.h
@@ -123,6 +123,8 @@
  * \param version the version string (typically a SVN revision keyword string)
  * \return nothing
  *
+ * \note As for 13.4.0, the \c version parameter is ignored.
+ *
  * This function should not be called directly, but instead the
  * ASTERISK_FILE_VERSION macro should be used to register a file with the core.
  */
@@ -139,12 +141,28 @@
  */
 void ast_unregister_file_version(const char *file);
 
-/*! \brief Find version for given module name
+/*!
+ * \brief Find version for given module name
  * \param file Module name (i.e. chan_sip.so)
- * \return version string or NULL if the module is not found
+ *
+ * \note As of 13.4.0, the file version is no longer tracked. As such,
+ * this function is a NoOp and will always return NULL.
+ *
+ * \retval NULL
  */
 const char *ast_file_version_find(const char *file);
 
+/*!
+ * \brief Complete a source file name
+ * \param partial The partial name of the file to look up.
+ * \param n The n-th match to return.
+ *
+ * \retval NULL if there is no match for partial at the n-th position
+ * \retval Matching source file name
+ *
+ * \note A matching source file is allocataed on the heap, and must be
+ * free'd by the caller.
+ */
 char *ast_complete_source_filename(const char *partial, int n);
 
 /*!
diff --git a/main/asterisk.c b/main/asterisk.c
index 2174c5c..4b82b49 100644
--- a/main/asterisk.c
+++ b/main/asterisk.c
@@ -326,84 +326,67 @@
 } sig_flags;
 
 #if !defined(LOW_MEMORY)
-struct file_version {
-   AST_RWLIST_ENTRY(file_version) list;
+struct registered_file {
+   AST_RWLIST_ENTRY(registered_file) list;
const char *file;
-   char *version;
 };
 
-static AST_RWLIST_HEAD_STATIC(file_versions, file_version);
+static AST_RWLIST_HEAD_STATIC(registered_files, registered_file);
 
 void ast_register_file_version(const char *file, const char *version)
 {
-   struct file_version *new;
-   char *work;
-   size_t version_length;
+   struct registered_file *reg;
 
-   work = ast_strdupa(version);
-   work = ast_strip(ast_strip_quoted(work, "$", "$"));
-   version_length = strlen(work) + 1;
-
-   if (!(new = ast_calloc(1, sizeof(*new) + version_length)))
+   reg = ast_calloc(1, sizeof(*reg));
+   if (!

[asterisk-dev] Change in asterisk[13]: git migration: Remove support for file versions

[Matt Jordan (Code Review)]

Matt Jordan has uploaded a new change for review.

  https://gerrit.asterisk.org/60

Change subject: git migration: Remove support for file versions
..

git migration: Remove support for file versions

Git does not support the ability to replace a token with a version
string during check-in. While it does have support for replacing a
token on clone, this is somewhat sub-optimal: the token is replaced
with the object hash, which is not particularly easy for human
consumption. What's more, in practice, the source file version was often
not terribly useful. Generally, when triaging bugs, the overall version
of Asterisk is far more useful than an individual SVN version of a file.
As a result, this patch removes Asterisk's support for showing source file
versions.

Specifically, it does the following:
* main/asterisk:
  - Refactor the file_version structure to reflect that it no longer
tracks a version field.
  - Remove the "core show file version" CLI command. Without the
file version, it is no longer useful.

* main/manager: Remove value from the Version key of the ModuleCheck
  Action. The actual key itself has not been removed, as doing so would
  absolutely constitute a backwards incompatible change. However, since
  the file version is no longer tracked, there is no need to attempt
  to include it in the Version key.

* UPGRADE: Add notes for:
  - Modification to the ModuleCheck AMI Action
  - Removal of the "core show file version" CLI command

Change-Id: Ia932d3c64cd18a14a3c894109baa657ec0a85d28
---
M UPGRADE.txt
M include/asterisk.h
M main/asterisk.c
M main/manager.c
4 files changed, 51 insertions(+), 132 deletions(-)


  git pull ssh://gerrit.asterisk.org:29418/asterisk refs/changes/60/60/1

diff --git a/UPGRADE.txt b/UPGRADE.txt
index 8b848cc..0ae82c1 100644
--- a/UPGRADE.txt
+++ b/UPGRADE.txt
@@ -33,6 +33,15 @@
should have no adverse effects for those upgrading; this note merely
serves as an indication that a new module exists.
 
+AMI:
+ - The 'ModuleCheck' Action's Version key will no longer show the module
+   version. The value will always be blank.
+
+CLI:
+ - The 'core show file version' command has been removed. When Asterisk
+   moved to Git, the source control version support was removed. As a
+   result, the CLi command was no longer useful and was removed as well.
+
 From 13.2.0 to 13.3.0:
 
 chan_dahdi:
diff --git a/include/asterisk.h b/include/asterisk.h
index 9a0264e..ff8715a 100644
--- a/include/asterisk.h
+++ b/include/asterisk.h
@@ -159,6 +159,8 @@
  * \param version the version string (typically a SVN revision keyword string)
  * \return nothing
  *
+ * \note As for 13.4.0, the \c version parameter is ignored.
+ *
  * This function should not be called directly, but instead the
  * ASTERISK_FILE_VERSION macro should be used to register a file with the core.
  */
@@ -175,12 +177,28 @@
  */
 void ast_unregister_file_version(const char *file);
 
-/*! \brief Find version for given module name
+/*!
+ * \brief Find version for given module name
  * \param file Module name (i.e. chan_sip.so)
- * \return version string or NULL if the module is not found
+ *
+ * \note As of 13.4.0, the file version is no longer tracked. As such,
+ * this function is a NoOp and will always return NULL.
+ *
+ * \retval NULL
  */
 const char *ast_file_version_find(const char *file);
 
+/*!
+ * \brief Complete a source file name
+ * \param partial The partial name of the file to look up.
+ * \param n The n-th match to return.
+ *
+ * \retval NULL if there is no match for partial at the n-th position
+ * \retval Matching source file name
+ *
+ * \note A matching source file is allocataed on the heap, and must be
+ * free'd by the caller.
+ */
 char *ast_complete_source_filename(const char *partial, int n);
 
 /*!
diff --git a/main/asterisk.c b/main/asterisk.c
index aa9d1f6..aee6403 100644
--- a/main/asterisk.c
+++ b/main/asterisk.c
@@ -475,84 +475,67 @@
 } sig_flags;
 
 #if !defined(LOW_MEMORY)
-struct file_version {
-   AST_RWLIST_ENTRY(file_version) list;
+struct registered_file {
+   AST_RWLIST_ENTRY(registered_file) list;
const char *file;
-   char *version;
 };
 
-static AST_RWLIST_HEAD_STATIC(file_versions, file_version);
+static AST_RWLIST_HEAD_STATIC(registered_files, registered_file);
 
 void ast_register_file_version(const char *file, const char *version)
 {
-   struct file_version *new;
-   char *work;
-   size_t version_length;
+   struct registered_file *reg;
 
-   work = ast_strdupa(version);
-   work = ast_strip(ast_strip_quoted(work, "$", "$"));
-   version_length = strlen(work) + 1;
-
-   if (!(new = ast_calloc(1, sizeof(*new) + version_length)))
+   reg = ast_calloc(1, sizeof(*reg));
+   if (!reg) {
return;
+   }
 
-   new->file = file;
- 

[asterisk-dev] Change in asterisk[master]: git migration: Remove support for file versions

[Matt Jordan (Code Review)]

Matt Jordan has abandoned this change.

Change subject: git migration: Remove support for file versions
..


Abandoned

-- 
To view, visit https://gerrit.asterisk.org/59
To unsubscribe, visit https://gerrit.asterisk.org/settings

Gerrit-MessageType: abandon
Gerrit-Change-Id: Ib82ec4e23d9f1d445e94430884ef60134fd0bfa7
Gerrit-PatchSet: 1
Gerrit-Project: asterisk
Gerrit-Branch: master
Gerrit-Owner: Matt Jordan 

-- 
_
-- Bandwidth and Colocation Provided by http://www.api-digital.com --

asterisk-dev mailing list
To UNSUBSCRIBE or update options visit:
   http://lists.digium.com/mailman/listinfo/asterisk-dev

[asterisk-dev] Change in asterisk[master]: git migration: Remove support for file versions

[Matt Jordan (Code Review)]

Matt Jordan has uploaded a new change for review.

  https://gerrit.asterisk.org/59

Change subject: git migration: Remove support for file versions
..

git migration: Remove support for file versions

Git does not support the ability to replace a token with a version
string during check-in. While it does have support for replacing a
token on clone, this is somewhat sub-optimal: the token is replaced
with the object hash, which is not particularly easy for human
consumption. What's more, in practice, the source file version was often
not terribly useful. Generally, when triaging bugs, the overall version
of Asterisk is far more useful than an individual SVN version of a file.
As a result, this patch removes Asterisk's support for showing source file
versions.

Specifically, it does the following:
* main/asterisk:
  - Refactor the file_version structure to reflect that it no longer
tracks a version field.
  - Remove the "core show file version" CLI command. Without the
file version, it is no longer useful.

* main/manager: Remove value from the Version key of the ModuleCheck
  Action. The actual key itself has not been removed, as doing so would
  absolutely constitute a backwards incompatible change. However, since
  the file version is no longer tracked, there is no need to attempt
  to include it in the Version key.

* UPGRADE: Add notes for:
  - Modification to the ModuleCheck AMI Action
  - Removal of the "core show file version" CLI command

Change-Id: Ib82ec4e23d9f1d445e94430884ef60134fd0bfa7
---
M UPGRADE.txt
M include/asterisk.h
M main/asterisk.c
M main/manager.c
4 files changed, 51 insertions(+), 132 deletions(-)


  git pull ssh://gerrit.asterisk.org:29418/asterisk refs/changes/59/59/1

diff --git a/UPGRADE.txt b/UPGRADE.txt
index 8b848cc..0ae82c1 100644
--- a/UPGRADE.txt
+++ b/UPGRADE.txt
@@ -33,6 +33,15 @@
should have no adverse effects for those upgrading; this note merely
serves as an indication that a new module exists.
 
+AMI:
+ - The 'ModuleCheck' Action's Version key will no longer show the module
+   version. The value will always be blank.
+
+CLI:
+ - The 'core show file version' command has been removed. When Asterisk
+   moved to Git, the source control version support was removed. As a
+   result, the CLi command was no longer useful and was removed as well.
+
 From 13.2.0 to 13.3.0:
 
 chan_dahdi:
diff --git a/include/asterisk.h b/include/asterisk.h
index 9a0264e..ff8715a 100644
--- a/include/asterisk.h
+++ b/include/asterisk.h
@@ -159,6 +159,8 @@
  * \param version the version string (typically a SVN revision keyword string)
  * \return nothing
  *
+ * \note As for 13.4.0, the \c version parameter is ignored.
+ *
  * This function should not be called directly, but instead the
  * ASTERISK_FILE_VERSION macro should be used to register a file with the core.
  */
@@ -175,12 +177,28 @@
  */
 void ast_unregister_file_version(const char *file);
 
-/*! \brief Find version for given module name
+/*!
+ * \brief Find version for given module name
  * \param file Module name (i.e. chan_sip.so)
- * \return version string or NULL if the module is not found
+ *
+ * \note As of 13.4.0, the file version is no longer tracked. As such,
+ * this function is a NoOp and will always return NULL.
+ *
+ * \retval NULL
  */
 const char *ast_file_version_find(const char *file);
 
+/*!
+ * \brief Complete a source file name
+ * \param partial The partial name of the file to look up.
+ * \param n The n-th match to return.
+ *
+ * \retval NULL if there is no match for partial at the n-th position
+ * \retval Matching source file name
+ *
+ * \note A matching source file is allocataed on the heap, and must be
+ * free'd by the caller.
+ */
 char *ast_complete_source_filename(const char *partial, int n);
 
 /*!
diff --git a/main/asterisk.c b/main/asterisk.c
index aa9d1f6..aee6403 100644
--- a/main/asterisk.c
+++ b/main/asterisk.c
@@ -475,84 +475,67 @@
 } sig_flags;
 
 #if !defined(LOW_MEMORY)
-struct file_version {
-   AST_RWLIST_ENTRY(file_version) list;
+struct registered_file {
+   AST_RWLIST_ENTRY(registered_file) list;
const char *file;
-   char *version;
 };
 
-static AST_RWLIST_HEAD_STATIC(file_versions, file_version);
+static AST_RWLIST_HEAD_STATIC(registered_files, registered_file);
 
 void ast_register_file_version(const char *file, const char *version)
 {
-   struct file_version *new;
-   char *work;
-   size_t version_length;
+   struct registered_file *reg;
 
-   work = ast_strdupa(version);
-   work = ast_strip(ast_strip_quoted(work, "$", "$"));
-   version_length = strlen(work) + 1;
-
-   if (!(new = ast_calloc(1, sizeof(*new) + version_length)))
+   reg = ast_calloc(1, sizeof(*reg));
+   if (!reg) {
return;
+   }
 
-   new->file = file;
- 

[asterisk-dev] Change in asterisk[master]: git migration: Remove support for file versions

[Matt Jordan (Code Review)]

Matt Jordan has abandoned this change.

Change subject: git migration: Remove support for file versions
..


Abandoned

Blech. This patch kind of got messed up in the process of trying to put up the 
Asterisk 13 version. I'm going to re-submit the latest patch set with a new 
ChangeId.

It's a learning process...

-- 
To view, visit https://gerrit.asterisk.org/54
To unsubscribe, visit https://gerrit.asterisk.org/settings

Gerrit-MessageType: abandon
Gerrit-Change-Id: Id146f24e9d968dccd64cb09dbfa1da3d9ac719f6
Gerrit-PatchSet: 6
Gerrit-Project: asterisk
Gerrit-Branch: master
Gerrit-Owner: Matt Jordan 
Gerrit-Reviewer: Corey Farrell 
Gerrit-Reviewer: Matt Jordan 

-- 
_
-- Bandwidth and Colocation Provided by http://www.api-digital.com --

asterisk-dev mailing list
To UNSUBSCRIBE or update options visit:
   http://lists.digium.com/mailman/listinfo/asterisk-dev

[asterisk-dev] Change in asterisk[master]: git migration: Remove support for file versions

[Matt Jordan (Code Review)]

Hello Corey Farrell,

I'd like you to reexamine a change.  Please visit

https://gerrit.asterisk.org/54

to look at the new patch set (#6).

Change subject: git migration: Remove support for file versions
..

git migration: Remove support for file versions

Git does not support the ability to replace a token with a version
string during check-in. While it does have support for replacing a
token on clone, this is somewhat sub-optimal: the token is replaced
with the object hash, which is not particularly easy for human
consumption. What's more, in practice, the source file version was often
not terribly useful. Generally, when triaging bugs, the overall version
of Asterisk is far more useful than an individual SVN version of a file.
As a result, this patch removes Asterisk's support for showing source file
versions.

Specifically, it does the following:
* main/asterisk:
  - Refactor the file_version structure to reflect that it no longer
tracks a version field.
  - Remove the "core show file version" CLI command. Without the
file version, it is no longer useful.

* main/manager: Remove value from the Version key of the ModuleCheck
  Action. The actual key itself has not been removed, as doing so would
  absolutely constitute a backwards incompatible change. However, since
  the file version is no longer tracked, there is no need to attempt
  to include it in the Version key.

* UPGRADE: Add notes for:
  - Modification to the ModuleCheck AMI Action
  - Removal of the "core show file version" CLI command

Change-Id: Id146f24e9d968dccd64cb09dbfa1da3d9ac719f6
---
M UPGRADE.txt
M include/asterisk.h
M main/asterisk.c
M main/manager.c
4 files changed, 51 insertions(+), 132 deletions(-)


  git pull ssh://gerrit.asterisk.org:29418/asterisk refs/changes/54/54/6
-- 
To view, visit https://gerrit.asterisk.org/54
To unsubscribe, visit https://gerrit.asterisk.org/settings

Gerrit-MessageType: newpatchset
Gerrit-Change-Id: Id146f24e9d968dccd64cb09dbfa1da3d9ac719f6
Gerrit-PatchSet: 6
Gerrit-Project: asterisk
Gerrit-Branch: master
Gerrit-Owner: Matt Jordan 
Gerrit-Reviewer: Corey Farrell 
Gerrit-Reviewer: Matt Jordan 

-- 
_
-- Bandwidth and Colocation Provided by http://www.api-digital.com --

asterisk-dev mailing list
To UNSUBSCRIBE or update options visit:
   http://lists.digium.com/mailman/listinfo/asterisk-dev

[asterisk-dev] Change in asterisk[master]: git migration: Refactor the ASTERISK_FILE_VERSION macro

[Matt Jordan (Code Review)]

Id: Id146f24e9d968dccd64cb09dbfa1da3d9ac719f6
Gerrit-PatchSet: 5
Gerrit-Project: asterisk
Gerrit-Branch: master
Gerrit-Owner: Matt Jordan 
Gerrit-Reviewer: Corey Farrell 
Gerrit-Reviewer: Matt Jordan 

-- 
_
-- Bandwidth and Colocation Provided by http://www.api-digital.com --

asterisk-dev mailing list
To UNSUBSCRIBE or update options visit:
   http://lists.digium.com/mailman/listinfo/asterisk-dev

[asterisk-dev] Change in asterisk[master]: git migration: Refactor the ASTERISK_FILE_VERSION macro

[Matt Jordan (Code Review)]

Matt Jordan has posted comments on this change.

Change subject: git migration: Refactor the ASTERISK_FILE_VERSION macro
..


Patch Set 3:

(3 comments)

https://gerrit.asterisk.org/#/c/54/3/include/asterisk.h
File include/asterisk.h:

Line 164: void ast_register_file(const char *file);
> Given that this is meant for use through a macro only, shouldn't it be __as
Works for me.


https://gerrit.asterisk.org/#/c/54/3/main/manager.c
File main/manager.c:

Line 5998:  snprintf(cut, (sizeof(filename) - strlen(filename)) - 1, ".c");
 :  ast_debug(1, " ModuleCheck .c file %s\n", filename);
> Since we're no longer checking the source file registration I think this sh
Good point - removed.


https://gerrit.asterisk.org/#/c/54/3/utils/check_expr.c
File utils/check_expr.c:

Line 155: //void ast_register_file(const char *file, const char *version);
: //void ast_unregister_file(const char *file);
> Delete..
I look forward to the day when we can delete all of the utils/ directory :-P


-- 
To view, visit https://gerrit.asterisk.org/54
To unsubscribe, visit https://gerrit.asterisk.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: Id146f24e9d968dccd64cb09dbfa1da3d9ac719f6
Gerrit-PatchSet: 3
Gerrit-Project: asterisk
Gerrit-Branch: master
Gerrit-Owner: Matt Jordan 
Gerrit-Reviewer: Corey Farrell 
Gerrit-Reviewer: Matt Jordan 
Gerrit-HasComments: Yes

-- 
_
-- Bandwidth and Colocation Provided by http://www.api-digital.com --

asterisk-dev mailing list
To UNSUBSCRIBE or update options visit:
   http://lists.digium.com/mailman/listinfo/asterisk-dev

[asterisk-dev] Change in asterisk[master]: git migration: Refactor the ASTERISK_FILE_VERSION macro

[Matt Jordan (Code Review)]

Id: Id146f24e9d968dccd64cb09dbfa1da3d9ac719f6
Gerrit-PatchSet: 4
Gerrit-Project: asterisk
Gerrit-Branch: master
Gerrit-Owner: Matt Jordan 
Gerrit-Reviewer: Corey Farrell 
Gerrit-Reviewer: Matt Jordan 

-- 
_
-- Bandwidth and Colocation Provided by http://www.api-digital.com --

asterisk-dev mailing list
To UNSUBSCRIBE or update options visit:
   http://lists.digium.com/mailman/listinfo/asterisk-dev

[asterisk-dev] Change in asterisk[master]: .gitignore: Ignore tarballs (*.gz)

[Matt Jordan (Code Review)]

Matt Jordan has posted comments on this change.

Change subject: .gitignore: Ignore tarballs (*.gz)
..


Patch Set 2: Code-Review+2 Verified+1

-- 
To view, visit https://gerrit.asterisk.org/55
To unsubscribe, visit https://gerrit.asterisk.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: Ie84f085cc0fa51262209e7bfc1b1ba8c04a1ef59
Gerrit-PatchSet: 2
Gerrit-Project: asterisk
Gerrit-Branch: master
Gerrit-Owner: Matt Jordan 
Gerrit-Reviewer: Corey Farrell 
Gerrit-Reviewer: Matt Jordan 
Gerrit-HasComments: No

-- 
_
-- Bandwidth and Colocation Provided by http://www.api-digital.com --

asterisk-dev mailing list
To UNSUBSCRIBE or update options visit:
   http://lists.digium.com/mailman/listinfo/asterisk-dev

[asterisk-dev] Change in asterisk[master]: .gitignore: Ignore tarballs (*.gz)

[Matt Jordan (Code Review)]

Matt Jordan has submitted this change and it was merged.

Change subject: .gitignore: Ignore tarballs (*.gz)
..


.gitignore: Ignore tarballs (*.gz)

This patch updates the root .gitignore file to ignore files with a .gz
extension. This will cause git to ignore downloaded sound tarballs in
the the sounds/ directory.

Change-Id: Ie84f085cc0fa51262209e7bfc1b1ba8c04a1ef59
---
M .gitignore
1 file changed, 1 insertion(+), 0 deletions(-)

Approvals:
  Matt Jordan: Looks good to me, approved; Verified
  Corey Farrell: Looks good to me, but someone else must approve



diff --git a/.gitignore b/.gitignore
index cf46873..33dd7cc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,6 +9,7 @@
 
 *~
 *.[oadi]
+*.gz
 *.ii
 *.oo
 *.eo

-- 
To view, visit https://gerrit.asterisk.org/55
To unsubscribe, visit https://gerrit.asterisk.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ie84f085cc0fa51262209e7bfc1b1ba8c04a1ef59
Gerrit-PatchSet: 2
Gerrit-Project: asterisk
Gerrit-Branch: master
Gerrit-Owner: Matt Jordan 
Gerrit-Reviewer: Corey Farrell 
Gerrit-Reviewer: Matt Jordan 

-- 
_
-- Bandwidth and Colocation Provided by http://www.api-digital.com --

asterisk-dev mailing list
To UNSUBSCRIBE or update options visit:
   http://lists.digium.com/mailman/listinfo/asterisk-dev

[asterisk-dev] Change in asterisk[master]: .gitignore: Ignore tarballs (*.gz)

[Matt Jordan (Code Review)]

Hello Corey Farrell,

I'd like you to reexamine a change.  Please visit

https://gerrit.asterisk.org/55

to look at the new patch set (#2).

Change subject: .gitignore: Ignore tarballs (*.gz)
..

.gitignore: Ignore tarballs (*.gz)

This patch updates the root .gitignore file to ignore files with a .gz
extension. This will cause git to ignore downloaded sound tarballs in
the the sounds/ directory.

Change-Id: Ie84f085cc0fa51262209e7bfc1b1ba8c04a1ef59
---
M .gitignore
1 file changed, 1 insertion(+), 0 deletions(-)


  git pull ssh://gerrit.asterisk.org:29418/asterisk refs/changes/55/55/2
-- 
To view, visit https://gerrit.asterisk.org/55
To unsubscribe, visit https://gerrit.asterisk.org/settings

Gerrit-MessageType: newpatchset
Gerrit-Change-Id: Ie84f085cc0fa51262209e7bfc1b1ba8c04a1ef59
Gerrit-PatchSet: 2
Gerrit-Project: asterisk
Gerrit-Branch: master
Gerrit-Owner: Matt Jordan 
Gerrit-Reviewer: Corey Farrell 
Gerrit-Reviewer: Matt Jordan 

-- 
_
-- Bandwidth and Colocation Provided by http://www.api-digital.com --

asterisk-dev mailing list
To UNSUBSCRIBE or update options visit:
   http://lists.digium.com/mailman/listinfo/asterisk-dev

[asterisk-dev] Change in asterisk[master]: sounds: Add a .gitignore file for downloaded sound tarballs

[Matt Jordan (Code Review)]

Matt Jordan has posted comments on this change.

Change subject: sounds: Add a .gitignore file for downloaded sound tarballs
..


Patch Set 1:

Yeah, *.gz would be better.

-- 
To view, visit https://gerrit.asterisk.org/55
To unsubscribe, visit https://gerrit.asterisk.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: Ie84f085cc0fa51262209e7bfc1b1ba8c04a1ef59
Gerrit-PatchSet: 1
Gerrit-Project: asterisk
Gerrit-Branch: master
Gerrit-Owner: Matt Jordan 
Gerrit-Reviewer: Corey Farrell 
Gerrit-Reviewer: Matt Jordan 
Gerrit-HasComments: No

-- 
_
-- Bandwidth and Colocation Provided by http://www.api-digital.com --

asterisk-dev mailing list
To UNSUBSCRIBE or update options visit:
   http://lists.digium.com/mailman/listinfo/asterisk-dev

[asterisk-dev] Change in asterisk[master]: sounds: Add a .gitignore file for downloaded sound tarballs

[Matt Jordan (Code Review)]

Matt Jordan has uploaded a new change for review.

  https://gerrit.asterisk.org/55

Change subject: sounds: Add a .gitignore file for downloaded sound tarballs
..

sounds: Add a .gitignore file for downloaded sound tarballs

This patch adds a .gitignore file in the sounds/ directory that will
ignore files prefixed with 'asterisk-'. This will cause git to ignore
downloaded sound tarballs.

Change-Id: Ie84f085cc0fa51262209e7bfc1b1ba8c04a1ef59
---
A sounds/.gitignore
1 file changed, 1 insertion(+), 0 deletions(-)


  git pull ssh://gerrit.asterisk.org:29418/asterisk refs/changes/55/55/1

diff --git a/sounds/.gitignore b/sounds/.gitignore
new file mode 100644
index 000..990f96b
--- /dev/null
+++ b/sounds/.gitignore
@@ -0,0 +1 @@
+asterisk-*

-- 
To view, visit https://gerrit.asterisk.org/55
To unsubscribe, visit https://gerrit.asterisk.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie84f085cc0fa51262209e7bfc1b1ba8c04a1ef59
Gerrit-PatchSet: 1
Gerrit-Project: asterisk
Gerrit-Branch: master
Gerrit-Owner: Matt Jordan 

-- 
_
-- Bandwidth and Colocation Provided by http://www.api-digital.com --

asterisk-dev mailing list
To UNSUBSCRIBE or update options visit:
   http://lists.digium.com/mailman/listinfo/asterisk-dev

[asterisk-dev] Change in asterisk[master]: Add .gitignore and .gitreview files

[Matt Jordan (Code Review)]

Matt Jordan has submitted this change and it was merged.

Change subject: Add .gitignore and .gitreview files
..


Add .gitignore and .gitreview files

Add the .gitignore and .gitreview files to the asterisk repo.

NB:  You can add local ignores to the .git/info/exclude file
without having to do a commit.

Common ignore patterns are in the top-level .gitignore file.
Subdirectory-specific ignore patterns are in their own .gitignore
files.

Change-Id: I842a1588ff27d8a0189f12d597f0a7af033d6c69
Tested-by: George Joseph
---
A .gitignore
A .gitreview
A addons/.gitignore
A agi/.gitignore
A build_tools/.gitignore
A doc/.gitignore
A include/asterisk/.gitignore
A main/.gitignore
A menuselect/.gitignore
A res/ael/.gitignore
A utils/.gitignore
11 files changed, 72 insertions(+), 0 deletions(-)

Approvals:
  Matt Jordan: Looks good to me, approved; Verified
  Russell Bryant: Looks good to me, but someone else must approve



diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000..cf46873
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,26 @@
+# git ls-files --others --exclude-from=.git/info/exclude
+# Lines that start with '#' are comments.
+# For a project mostly in C, the following would be a good set of
+# exclude patterns (uncomment them if you want to use them):
+# *.[oa]
+# *~
+
+# See .gitignore in subdirectories for more ignored files
+
+*~
+*.[oadi]
+*.ii
+*.oo
+*.eo
+*.so
+*.exports
+*.moduleinfo
+*.makeopts
+*.makedeps
+makeopts
+.lastclean
+config.log
+config.status
+defaults.h
+makeopts.embed_rules
+menuselect-tree
diff --git a/.gitreview b/.gitreview
new file mode 100644
index 000..f9ef050
--- /dev/null
+++ b/.gitreview
@@ -0,0 +1,4 @@
+[gerrit]
+host=gerrit.asterisk.org
+port=29418
+project=asterisk.git
diff --git a/addons/.gitignore b/addons/.gitignore
new file mode 100644
index 000..663e668
--- /dev/null
+++ b/addons/.gitignore
@@ -0,0 +1 @@
+mp3
diff --git a/agi/.gitignore b/agi/.gitignore
new file mode 100644
index 000..9b2a4e2
--- /dev/null
+++ b/agi/.gitignore
@@ -0,0 +1,3 @@
+eagi-sphinx-test
+eagi-test
+strcompat.c
diff --git a/build_tools/.gitignore b/build_tools/.gitignore
new file mode 100644
index 000..c60a0df
--- /dev/null
+++ b/build_tools/.gitignore
@@ -0,0 +1 @@
+menuselect-deps
diff --git a/doc/.gitignore b/doc/.gitignore
new file mode 100644
index 000..27acdb3
--- /dev/null
+++ b/doc/.gitignore
@@ -0,0 +1 @@
+core-en_US.xml
diff --git a/include/asterisk/.gitignore b/include/asterisk/.gitignore
new file mode 100644
index 000..ae33b3c
--- /dev/null
+++ b/include/asterisk/.gitignore
@@ -0,0 +1,3 @@
+autoconfig.h
+build.h
+buildopts.h
diff --git a/main/.gitignore b/main/.gitignore
new file mode 100644
index 000..23f5c58
--- /dev/null
+++ b/main/.gitignore
@@ -0,0 +1,3 @@
+asterisk
+libasteriskssl.so.1
+version.c
diff --git a/menuselect/.gitignore b/menuselect/.gitignore
new file mode 100644
index 000..38ea2d3
--- /dev/null
+++ b/menuselect/.gitignore
@@ -0,0 +1,5 @@
+autoconfig.h
+cmenuselect
+config.log
+config.status
+menuselect
diff --git a/res/ael/.gitignore b/res/ael/.gitignore
new file mode 100644
index 000..f39b612
--- /dev/null
+++ b/res/ael/.gitignore
@@ -0,0 +1 @@
+ael.output
diff --git a/utils/.gitignore b/utils/.gitignore
new file mode 100644
index 000..ed37a06
--- /dev/null
+++ b/utils/.gitignore
@@ -0,0 +1,24 @@
+aelbison.c
+aelparse
+aelparse.c
+ast_expr2.c
+ast_expr2f.c
+astman
+astcanary
+astdb2bdb
+astdb2sqlite3
+check_expr
+check_expr2
+conf2ael
+db1-ast/libdb1.a
+hashtab.c
+lock.c
+md5.c
+muted
+pbx_ael.c
+pval.c
+smsq
+stereorize
+strcompat.c
+streamplayer
+threadstorage.c

-- 
To view, visit https://gerrit.asterisk.org/42
To unsubscribe, visit https://gerrit.asterisk.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I842a1588ff27d8a0189f12d597f0a7af033d6c69
Gerrit-PatchSet: 3
Gerrit-Project: asterisk
Gerrit-Branch: master
Gerrit-Owner: George Joseph 
Gerrit-Reviewer: Corey Farrell 
Gerrit-Reviewer: George Joseph 
Gerrit-Reviewer: Matt Jordan 
Gerrit-Reviewer: Russell Bryant 

-- 
_
-- Bandwidth and Colocation Provided by http://www.api-digital.com --

asterisk-dev mailing list
To UNSUBSCRIBE or update options visit:
   http://lists.digium.com/mailman/listinfo/asterisk-dev

[asterisk-dev] Change in asterisk[master]: Add .gitignore and .gitreview files

[Matt Jordan (Code Review)]

Matt Jordan has posted comments on this change.

Change subject: Add .gitignore and .gitreview files
..


Patch Set 3: Code-Review+2 Verified+1

-- 
To view, visit https://gerrit.asterisk.org/42
To unsubscribe, visit https://gerrit.asterisk.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I842a1588ff27d8a0189f12d597f0a7af033d6c69
Gerrit-PatchSet: 3
Gerrit-Project: asterisk
Gerrit-Branch: master
Gerrit-Owner: George Joseph 
Gerrit-Reviewer: Corey Farrell 
Gerrit-Reviewer: George Joseph 
Gerrit-Reviewer: Matt Jordan 
Gerrit-Reviewer: Russell Bryant 
Gerrit-HasComments: No

-- 
_
-- Bandwidth and Colocation Provided by http://www.api-digital.com --

asterisk-dev mailing list
To UNSUBSCRIBE or update options visit:
   http://lists.digium.com/mailman/listinfo/asterisk-dev

[asterisk-dev] Change in asterisk[master]: git migration: Refactor the ASTERISK_FILE_VERSION macro

[Matt Jordan (Code Review)]

Matt Jordan has posted comments on this change.

Change subject: git migration: Refactor the ASTERISK_FILE_VERSION macro
..


Patch Set 3:

Note for reviewers:

This patch will break ABI, and can't be backported as-is. Once approved, 
cherry-picked versions will be put up for the rest of the branches in Asterisk 
that still receive releases. In those cases, ABI will be maintained and we'll 
simply not bother printing out the bogus Version string.

-- 
To view, visit https://gerrit.asterisk.org/54
To unsubscribe, visit https://gerrit.asterisk.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: Id146f24e9d968dccd64cb09dbfa1da3d9ac719f6
Gerrit-PatchSet: 3
Gerrit-Project: asterisk
Gerrit-Branch: master
Gerrit-Owner: Matt Jordan 
Gerrit-Reviewer: Matt Jordan 
Gerrit-HasComments: No

-- 
_
-- Bandwidth and Colocation Provided by http://www.api-digital.com --

asterisk-dev mailing list
To UNSUBSCRIBE or update options visit:
   http://lists.digium.com/mailman/listinfo/asterisk-dev

[asterisk-dev] Change in asterisk[master]: git migration: Refactor the ASTERISK_FILE_VERSION macro

[Matt Jordan (Code Review)]

Matt Jordan has uploaded a new patch set (#3).

Change subject: git migration: Refactor the ASTERISK_FILE_VERSION macro
..

git migration: Refactor the ASTERISK_FILE_VERSION macro

Git does not support the ability to replace a token with a version
string during check-in. While it does have support for replacing a
token on clone, this is somewhat sub-optimal: the token is replaced
with the object hash, which is not particularly easy for human
consumption. What's more, in practice, the source file version was often
not terribly useful. Generally, when triaging bugs, the overall version
of Asterisk is far more useful than an individual SVN version of a file. As a
result, this patch removes Asterisk's support for showing source file
versions.

Specifically, it does the following:

* Rename ASTERISK_FILE_VERSION macro to ASTERISK_REGISTER_FILE, and
  remove passing the version in with the macro. Other facilities other
  than 'core show file version' make use of the file names, such as
  setting a debug level only on a specific file. As such, the act of
  registering source files with the Asterisk core still has use. The
  macro rename now reflects the new macro purpose.

* main/asterisk:
  - Refactor the file_version structure to reflect that it no longer
tracks a version field.
  - Remove the "core show file version" CLI command. Without the file
version, it is no longer useful.
  - Remove the ast_file_version_find function. The file version is no
longer tracked.
  - Rename ast_register_file_version/ast_unregister_file_version to
ast_register_file/ast_unregister_file, respectively.

* main/manager: Remove value from the Version key of the ModuleCheck
  Action. The actual key itself has not been removed, as doing so would
  absolutely constitute a backwards incompatible change. However, since
  the file version is no longer tracked, there is no need to attempt to
  include it in the Version key.

* UPGRADE: Add notes for:
  - Modification to the ModuleCheck AMI Action
  - Removal of the "core show file version" CLI command

Change-Id: Id146f24e9d968dccd64cb09dbfa1da3d9ac719f6
---
M UPGRADE.txt
M addons/cdr_mysql.c
M addons/chan_mobile.c
M addons/format_mp3.c
M addons/ooh323c/src/ooSocket.c
M addons/res_config_mysql.c
M apps/app_adsiprog.c
M apps/app_agent_pool.c
M apps/app_alarmreceiver.c
M apps/app_amd.c
M apps/app_authenticate.c
M apps/app_bridgewait.c
M apps/app_cdr.c
M apps/app_celgenuserevent.c
M apps/app_chanisavail.c
M apps/app_channelredirect.c
M apps/app_chanspy.c
M apps/app_confbridge.c
M apps/app_controlplayback.c
M apps/app_dahdiras.c
M apps/app_db.c
M apps/app_dial.c
M apps/app_dictate.c
M apps/app_directed_pickup.c
M apps/app_directory.c
M apps/app_disa.c
M apps/app_dumpchan.c
M apps/app_echo.c
M apps/app_exec.c
M apps/app_externalivr.c
M apps/app_fax.c
M apps/app_festival.c
M apps/app_flash.c
M apps/app_followme.c
M apps/app_forkcdr.c
M apps/app_getcpeid.c
M apps/app_ices.c
M apps/app_image.c
M apps/app_ivrdemo.c
M apps/app_jack.c
M apps/app_macro.c
M apps/app_meetme.c
M apps/app_milliwatt.c
M apps/app_minivm.c
M apps/app_mixmonitor.c
M apps/app_morsecode.c
M apps/app_mp3.c
M apps/app_nbscat.c
M apps/app_originate.c
M apps/app_osplookup.c
M apps/app_page.c
M apps/app_playback.c
M apps/app_playtones.c
M apps/app_privacy.c
M apps/app_queue.c
M apps/app_read.c
M apps/app_readexten.c
M apps/app_record.c
M apps/app_saycounted.c
M apps/app_sayunixtime.c
M apps/app_senddtmf.c
M apps/app_sendtext.c
M apps/app_setcallerid.c
M apps/app_skel.c
M apps/app_sms.c
M apps/app_softhangup.c
M apps/app_speech_utils.c
M apps/app_stack.c
M apps/app_stasis.c
M apps/app_system.c
M apps/app_talkdetect.c
M apps/app_test.c
M apps/app_transfer.c
M apps/app_url.c
M apps/app_userevent.c
M apps/app_verbose.c
M apps/app_voicemail.c
M apps/app_waitforring.c
M apps/app_waitforsilence.c
M apps/app_waituntil.c
M apps/app_while.c
M apps/app_zapateller.c
M apps/confbridge/conf_chan_announce.c
M apps/confbridge/conf_chan_record.c
M apps/confbridge/conf_config_parser.c
M apps/confbridge/confbridge_manager.c
M bridges/bridge_builtin_features.c
M bridges/bridge_builtin_interval_features.c
M bridges/bridge_holding.c
M bridges/bridge_native_rtp.c
M bridges/bridge_simple.c
M bridges/bridge_softmix.c
M cdr/cdr_adaptive_odbc.c
M cdr/cdr_csv.c
M cdr/cdr_custom.c
M cdr/cdr_manager.c
M cdr/cdr_odbc.c
M cdr/cdr_pgsql.c
M cdr/cdr_radius.c
M cdr/cdr_sqlite.c
M cdr/cdr_sqlite3_custom.c
M cdr/cdr_syslog.c
M cdr/cdr_tds.c
M cel/cel_custom.c
M cel/cel_manager.c
M cel/cel_odbc.c
M cel/cel_pgsql.c
M cel/cel_radius.c
M cel/cel_sqlite3_custom.c
M cel/cel_tds.c
M channels/chan_alsa.c
M channels/chan_bridge_media.c
M channels/chan_console.c
M channels/chan_dahdi.c
M channels/chan_iax2.c
M channels/chan_mgcp.c
M channels/chan_misdn.c
M channels/chan_motif.c
M channels/chan_nbs.c
M channels/chan_oss.c
M channels/chan_phone.c
M chann

[asterisk-dev] Change in asterisk[master]: git migration: Refactor the ASTERISK_FILE_VERSION macro

[Matt Jordan (Code Review)]

Matt Jordan has uploaded a new patch set (#2).

Change subject: git migration: Refactor the ASTERISK_FILE_VERSION macro
..

git migration: Refactor the ASTERISK_FILE_VERSION macro

Git does not support the ability to replace a token with a version
string during check-in. While it does have support for replacing a
token on clone, this is somewhat sub-optimal: the token is replaced
with the object hash, which is not particularly easy for human
consumption. What's more, in practice, the source file version was often
not terribly useful. Generally, when triaging bugs, the overall version
of Asterisk is far more useful than an individual SVN version of a file. As a
result, this patch removes Asterisk's support for showing source file
versions.

Specifically, it does the following:

* Rename ASTERISK_FILE_VERSION macro to ASTERISK_REGISTER_FILE, and
  remove passing the version in with the macro. Other facilities other
  than 'core show file version' make use of the file names, such as
  setting a debug level only on a specific file. As such, the act of
  registering source files with the Asterisk core still has use. The
  macro rename now reflects the new macro purpose.

* main/asterisk:
  - Refactor the file_version structure to reflect that it no longer
tracks a version field.
  - Remove the "core show file version" CLI command. Without the file
version, it is no longer useful.
  - Remove the ast_file_version_find function. The file version is no
longer tracked.
  - Rename ast_register_file_version/ast_unregister_file_version to
ast_register_file/ast_unregister_file, respectively.

* main/manager: Remove value from the Version key of the ModuleCheck
  Action. The actual key itself has not been removed, as doing so would
  absolutely constitute a backwards incompatible change. However, since
  the file version is no longer tracked, there is no need to attempt to
  include it in the Version key.

* UPGRADE: Add notes for:
  - Modification to the ModuleCheck AMI Action
  - Removal of the "core show file version" CLI command

Change-Id: Id146f24e9d968dccd64cb09dbfa1da3d9ac719f6
---
M UPGRADE.txt
M addons/cdr_mysql.c
M addons/chan_mobile.c
M addons/format_mp3.c
M addons/ooh323c/src/ooSocket.c
M addons/res_config_mysql.c
M apps/app_adsiprog.c
M apps/app_agent_pool.c
M apps/app_alarmreceiver.c
M apps/app_amd.c
M apps/app_authenticate.c
M apps/app_bridgewait.c
M apps/app_cdr.c
M apps/app_celgenuserevent.c
M apps/app_chanisavail.c
M apps/app_channelredirect.c
M apps/app_chanspy.c
M apps/app_confbridge.c
M apps/app_controlplayback.c
M apps/app_dahdiras.c
M apps/app_db.c
M apps/app_dial.c
M apps/app_dictate.c
M apps/app_directed_pickup.c
M apps/app_directory.c
M apps/app_disa.c
M apps/app_dumpchan.c
M apps/app_echo.c
M apps/app_exec.c
M apps/app_externalivr.c
M apps/app_fax.c
M apps/app_festival.c
M apps/app_flash.c
M apps/app_followme.c
M apps/app_forkcdr.c
M apps/app_getcpeid.c
M apps/app_ices.c
M apps/app_image.c
M apps/app_ivrdemo.c
M apps/app_jack.c
M apps/app_macro.c
M apps/app_meetme.c
M apps/app_milliwatt.c
M apps/app_minivm.c
M apps/app_mixmonitor.c
M apps/app_morsecode.c
M apps/app_mp3.c
M apps/app_nbscat.c
M apps/app_originate.c
M apps/app_osplookup.c
M apps/app_page.c
M apps/app_playback.c
M apps/app_playtones.c
M apps/app_privacy.c
M apps/app_queue.c
M apps/app_read.c
M apps/app_readexten.c
M apps/app_record.c
M apps/app_saycounted.c
M apps/app_sayunixtime.c
M apps/app_senddtmf.c
M apps/app_sendtext.c
M apps/app_setcallerid.c
M apps/app_skel.c
M apps/app_sms.c
M apps/app_softhangup.c
M apps/app_speech_utils.c
M apps/app_stack.c
M apps/app_stasis.c
M apps/app_system.c
M apps/app_talkdetect.c
M apps/app_test.c
M apps/app_transfer.c
M apps/app_url.c
M apps/app_userevent.c
M apps/app_verbose.c
M apps/app_voicemail.c
M apps/app_waitforring.c
M apps/app_waitforsilence.c
M apps/app_waituntil.c
M apps/app_while.c
M apps/app_zapateller.c
M apps/confbridge/conf_chan_announce.c
M apps/confbridge/conf_chan_record.c
M apps/confbridge/conf_config_parser.c
M apps/confbridge/confbridge_manager.c
M bridges/bridge_builtin_features.c
M bridges/bridge_builtin_interval_features.c
M bridges/bridge_holding.c
M bridges/bridge_native_rtp.c
M bridges/bridge_simple.c
M bridges/bridge_softmix.c
M cdr/cdr_adaptive_odbc.c
M cdr/cdr_csv.c
M cdr/cdr_custom.c
M cdr/cdr_manager.c
M cdr/cdr_odbc.c
M cdr/cdr_pgsql.c
M cdr/cdr_radius.c
M cdr/cdr_sqlite.c
M cdr/cdr_sqlite3_custom.c
M cdr/cdr_syslog.c
M cdr/cdr_tds.c
M cel/cel_custom.c
M cel/cel_manager.c
M cel/cel_odbc.c
M cel/cel_pgsql.c
M cel/cel_radius.c
M cel/cel_sqlite3_custom.c
M cel/cel_tds.c
M channels/chan_alsa.c
M channels/chan_bridge_media.c
M channels/chan_console.c
M channels/chan_dahdi.c
M channels/chan_iax2.c
M channels/chan_mgcp.c
M channels/chan_misdn.c
M channels/chan_motif.c
M channels/chan_nbs.c
M channels/chan_oss.c
M channels/chan_phone.c
M chann

[asterisk-dev] Change in asterisk[master]: Add .gitignore and .gitreview files

[Matt Jordan (Code Review)]

Matt Jordan has posted comments on this change.

Change subject: Add .gitignore and .gitreview files
..


Patch Set 2:

(2 comments)

https://gerrit.asterisk.org/#/c/42/2/.gitignore
File .gitignore:

Line 21: addons/mp3
> I personally think it's nicer to use .gitignore files in subdirectories.  S
To address George's comment: I'm good either way.


https://gerrit.asterisk.org/#/c/42/2//COMMIT_MSG
Commit Message:

Line 15: Tested-by: George Joseph
> I think it would be good to move to using the same format for other git hea
I'd be fine with that, but we'll need to update the wiki/commit message script 
as well. We should be able to extract that quite easily from JIRA - in fact, 
it'd probably be helpful to just have a script that returns that and the CLA 
License numbers as appropriate.

/me makes a note to do that.


-- 
To view, visit https://gerrit.asterisk.org/42
To unsubscribe, visit https://gerrit.asterisk.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I842a1588ff27d8a0189f12d597f0a7af033d6c69
Gerrit-PatchSet: 2
Gerrit-Project: asterisk
Gerrit-Branch: master
Gerrit-Owner: George Joseph 
Gerrit-Reviewer: Corey Farrell 
Gerrit-Reviewer: George Joseph 
Gerrit-Reviewer: Matt Jordan 
Gerrit-Reviewer: Russell Bryant 
Gerrit-HasComments: Yes

-- 
_
-- Bandwidth and Colocation Provided by http://www.api-digital.com --

asterisk-dev mailing list
To UNSUBSCRIBE or update options visit:
   http://lists.digium.com/mailman/listinfo/asterisk-dev

Re: [asterisk-dev] [Code Review] 4609: chan_pjsip/res_pjsip/bridge_softmix/core: Improve translation path choices.

[Matt Jordan]

---
This is an automatically generated e-mail. To reply, visit:
https://reviewboard.asterisk.org/r/4609/#review15183
---


Reviewed: I didn't have any findings.

- Matt Jordan


On April 9, 2015, 3:50 p.m., rmudgett wrote:
> 
> ---
> This is an automatically generated e-mail. To reply, visit:
> https://reviewboard.asterisk.org/r/4609/
> ---
> 
> (Updated April 9, 2015, 3:50 p.m.)
> 
> 
> Review request for Asterisk Developers.
> 
> 
> Bugs: ASTERISK-24841
> https://issues.asterisk.org/jira/browse/ASTERISK-24841
> 
> 
> Repository: Asterisk
> 
> 
> Description
> ---
> 
> With this patch, chan_pjsip/res_pjsip now sets the native formats to the
> codecs negotiated by a call.
> 
> * The changes in chan_pjsip.c and res_pjsip_sdp_rtp.c set the native
> formats to include all the negotiated audio codecs instead of only the
> initial preferred audio codec and later the currently received audio
> codec.
> 
> * The audio frame handling in channel.c:ast_read() is more streamlined and
> will automatically adjust to changes in received frame formats.  The new
> policy is to remove translation and pass the new frame format to the
> receiver except if the translation was to a signed linear format.  A more
> long winded version is commented in ast_read() along with some caveats.
> 
> * The audio frame handling in channel.c:ast_write() is more streamlined
> and will automatically adjust any needed translation to changes in the
> frame formats sent.  Frame formats sent can change for many reasons such
> as a recording is being played back or the bridged peer changed the format
> it sends.  Since it is a normal expectation that sent formats can change,
> the codec mismatch warning message is demoted to a debug message.
> 
> * Removed the short circuit check in
> channel.c:ast_channel_make_compatible_helper().  Two party bridges need to
> make channels compatible with each other.  However, transfers and moving
> channels among bridges can result in otherwise compatible channels having
> sub-optimal translation paths if the make compatible check is short
> circuited.  A result of forcing the reevaluation of channel compatibility
> is that the asterisk.conf:transcode_via_slin and codecs.conf:genericplc
> options take effect consistently now.  It is unfortunate that these two
> options are enabled by default and negate some of the benefits to the
> changes in channel.c:ast_read() by forcing translation through signed
> linear on a two party bridge.
> 
> * Improved the softmix bridge technology to better control the translation
> of frames to the bridge.  All of the incoming translation is now normally
> handled by ast_read() instead of splitting any translation steps between
> ast_read() and the slin factory.  If any frame comes in with an unexpected
> format then the translation path in ast_read() is updated for the next
> frame and the slin factory handles the current frame translation.
> 
> This is the final patch in a series of patches aimed at improving
> translation path choices.  The other patches are on the following reviews:
> https://reviewboard.asterisk.org/r/4600/
> https://reviewboard.asterisk.org/r/4605/
> 
> 
> Diffs
> -
> 
>   /branches/13/res/res_pjsip_sdp_rtp.c 434526 
>   /branches/13/main/channel.c 434526 
>   /branches/13/include/asterisk/channel.h 434526 
>   /branches/13/channels/chan_pjsip.c 434526 
>   /branches/13/bridges/bridge_softmix.c 434526 
> 
> Diff: https://reviewboard.asterisk.org/r/4609/diff/
> 
> 
> Testing
> ---
> 
> * The testsuite still passes as well as it ever has.
> 
> * Manual SIP and DTMF attended transfers still function.  With all patches
> in the series applied, if a low speed party transfers a higher speed party
> to another high speed party then when the transfer completes the resulting
> call works at the higher speed.  Without the patch the resulting call may
> go through a sub-optimal translation path with reduced audio quality.
> 
> * ConfBridge bridges are able to change mixing rates as different speed
> participants enter and leave the bridge.  Sound files played back to
> individual participants may go out with a different codec than the
> participant sends to the conference.  If the conference bridge is mixing
> at a lower rate than a participant then the conference media may go out
> with a different codec than the participant sends to the conference.
> 
> * Used app_originate to setup a call through a non-optimizing local
> chan

Re: [asterisk-dev] [Code Review] 4576: testsuite: Add PJSIP test for new auto_dtmf option.

[Matt Jordan]

> On April 10, 2015, 9:50 a.m., Matt Jordan wrote:
> > I'm going to go ahead and post this for review on Gerrit 
> > (gerrit.asterisk.org) - particularly since the 'findings' were very minor.
> > 
> > That will allow us to go ahead and commit the patch for the auto-dtmf mode 
> > ahead of the move to Git next week.

Actually, I just noticed that the pcap files containing the RFC 4733 DTMF and 
the Inband DTMF were never attached to the review. Can you svn add them and 
post them up here? Barring that, attaching them to the Asterisk issue would 
suffice.


- Matt


---
This is an automatically generated e-mail. To reply, visit:
https://reviewboard.asterisk.org/r/4576/#review15179
---


On April 2, 2015, 9:04 a.m., yaron nahum wrote:
> 
> ---
> This is an automatically generated e-mail. To reply, visit:
> https://reviewboard.asterisk.org/r/4576/
> ---
> 
> (Updated April 2, 2015, 9:04 a.m.)
> 
> 
> Review request for Asterisk Developers.
> 
> 
> Bugs: ASTERISK-24706
> https://issues.asterisk.org/jira/browse/ASTERISK-24706
> 
> 
> Repository: testsuite
> 
> 
> Description
> ---
> 
> This is the testsuite test to test the auto_dtmf option added by review:
> https://reviewboard.asterisk.org/r/4438/
> 
> The test passes.
> 
> 
> Diffs
> -
> 
>   /asterisk/trunk/tests/channels/pjsip/tests.yaml 6564 
>   /asterisk/trunk/tests/channels/pjsip/auto_dtmf/test-config.yaml 
> PRE-CREATION 
>   /asterisk/trunk/tests/channels/pjsip/auto_dtmf/sipp/dtmf_rfc2833.xml 
> PRE-CREATION 
>   /asterisk/trunk/tests/channels/pjsip/auto_dtmf/sipp/dtmf_inband.xml 
> PRE-CREATION 
>   /asterisk/trunk/tests/channels/pjsip/auto_dtmf/configs/ast1/pjsip.conf 
> PRE-CREATION 
>   /asterisk/trunk/tests/channels/pjsip/auto_dtmf/configs/ast1/extensions.conf 
> PRE-CREATION 
> 
> Diff: https://reviewboard.asterisk.org/r/4576/diff/
> 
> 
> Testing
> ---
> 
> 
> Thanks,
> 
> yaron nahum
> 
>

-- 
_
-- Bandwidth and Colocation Provided by http://www.api-digital.com --

asterisk-dev mailing list
To UNSUBSCRIBE or update options visit:
   http://lists.digium.com/mailman/listinfo/asterisk-dev

Re: [asterisk-dev] [Code Review] 4391: Add blank line between headers and output for Command action response

[Matt Jordan]

> On April 3, 2015, 5:37 a.m., Corey Farrell wrote:
> > /trunk/main/manager.c, line 4873
> > 
> >
> > If we successfully ran the command, it seems unsafe to claim failure.  
> > We have to assume the the caller doesn't actually care about any of the CLI 
> > output, they only care about having the command perform an action.  So I 
> > think we need to respond with success if the command ran.  I'm leaning 
> > towards thinking that this error should be provided through a single 
> > "Output: Command response construction error\r\n", so move astman_start_ack 
> > to just below ast_cli_command.
> > 
> > On a related issue, there are a couple errors that can occur in 
> > ast_cli_command_full which print error messages and return success.  I 
> > don't know if it's safe to modify ast_cli_command_full to return errors for 
> > more situations, it might be worth looking at to allow us to trust the 
> > return value of ast_cli_command_full.  CLI commands themselves can return 
> > an error, but this error is not returned by ast_cli_command_full.  It would 
> > be nice if this action could use the return value from ast_cli_command_full 
> > to determine if it should respond success or failure.
> 
> gareth wrote:
> If the caller is executing any of the ' show ...' commands then 
> they likely care about the output. In this case, I think it would be better 
> to provide a more descriptive error message to the caller so they can detect 
> if the command was executed.
> 
> Yes, ast_cli_commmand_full should indicate whether the command failed, I 
> will modify it so that an Error response can sent if the command fails. There 
> don't appear to be any callers of that function who check the return code.
> 
> Corey Farrell wrote:
> I do not feel this issue is resolved.  If a command has side-effects, we 
> should respond with Success/Failure based on if the command ran - regardless 
> of our (in)ability to process output.  Since there is no way to determine if 
> a CLI command is meant to retrieve information or manipulate it, we have to 
> assume that it is manipulating something.  So I agree that descriptive error 
> messages are useful, we need to avoid lying to the caller by claiming that 
> the command failed to run if it did run.
> 
> For times where people are just retrieving information, couldn't we 
> respond with success, put the error in 'Message:', and provide no 'Output:' 
> headers?  This way if you care about the output, you can detect the lack of 
> output.

This is a tricky one, but I think I agree with Corey on this.

We will already send an Error with a Message value if the command was executed 
but returned a failure response code. The fact that we executed the command 
successfully but had an internal error that precluded showing the response 
feels like it should be different from conditions where we either never ran the 
command at all.

How about changing the astman_send_error to the Message: that is sent with a 
status of Error? In those cases, there wouldn't be any response that follows - 
since we can't send it - but there is still an overall indication that the 
command succeeded (sorta).


- Matt


---
This is an automatically generated e-mail. To reply, visit:
https://reviewboard.asterisk.org/r/4391/#review15039
---


On April 9, 2015, 12:05 a.m., gareth wrote:
> 
> ---
> This is an automatically generated e-mail. To reply, visit:
> https://reviewboard.asterisk.org/r/4391/
> ---
> 
> (Updated April 9, 2015, 12:05 a.m.)
> 
> 
> Review request for Asterisk Developers.
> 
> 
> Bugs: ASTERISK-24730
> https://issues.asterisk.org/jira/browse/ASTERISK-24730
> 
> 
> Repository: Asterisk
> 
> 
> Description
> ---
> 
> This patch adds a blank line between the headers and the output in the 
> Command action response. The reason for this change is to make it easier to 
> determine where the headers end and the output from the command starts.
> 
> Currently, to parse a response to a Command action, one has to:
> 
> 1. Read one line, if line is "Response: Error", parse the remaining as a 
> standard AMI response and stop.
> 2. Read one more line - or two if you used an ActionID - those lines are the 
> headers.
> 3. Then read everything up to "--END COMMAND--\r\n\r\n".
> 
> That could be changed to:
> 
> 1. Read standard AMI response.
> 2. If "Response: Follows", then read everything up to "--END 
> COMMAND--\r\n\r\n".
> 
> The AMI version has been increased to 2.8.0 as this is a protocol change and 
> so that clients detect the new behavior.
> 
> Adding a blank line should not cause older parsers to fail as they have to 
> read everything up to "--END COMMAND--\r\

[asterisk-dev] Change in testsuite[master]: res_phoneprov_pjsip: Disconnect HTTP before stopping Asterisk.

[Matt Jordan (Code Review)]

Matt Jordan has posted comments on this change.

Change subject: res_phoneprov_pjsip: Disconnect HTTP before stopping Asterisk.
..


Patch Set 3: Code-Review+1

-- 
To view, visit https://gerrit.asterisk.org/35
To unsubscribe, visit https://gerrit.asterisk.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I5553af9cbfdc1d68110036eaadcfe5db3570928f
Gerrit-PatchSet: 3
Gerrit-Project: testsuite
Gerrit-Branch: master
Gerrit-Owner: Corey Farrell 
Gerrit-Reviewer: Anonymous Coward #119
Gerrit-Reviewer: Matt Jordan 
Gerrit-HasComments: No

-- 
_
-- Bandwidth and Colocation Provided by http://www.api-digital.com --

asterisk-dev mailing list
To UNSUBSCRIBE or update options visit:
   http://lists.digium.com/mailman/listinfo/asterisk-dev

Re: [asterisk-dev] [Code Review] 4588: IAX make calltoken expiration time configurable

[Matt Jordan]

---
This is an automatically generated e-mail. To reply, visit:
https://reviewboard.asterisk.org/r/4588/#review15152
---

Ship it!


Other than having this get documented in the CHANGES file, this looks good to 
go. Since that's relatively minor, I'll Ship It.

- Matt Jordan


On April 9, 2015, 9:21 a.m., Y Ateya wrote:
> 
> ---
> This is an automatically generated e-mail. To reply, visit:
> https://reviewboard.asterisk.org/r/4588/
> ---
> 
> (Updated April 9, 2015, 9:21 a.m.)
> 
> 
> Review request for Asterisk Developers.
> 
> 
> Bugs: ASTERISK-24939
> https://issues.asterisk.org/jira/browse/ASTERISK-24939
> 
> 
> Repository: Asterisk
> 
> 
> Description
> ---
> 
> The section 4.1 in call token changes to IAX protocol 
> (http://downloads.asterisk.org/pub/security/IAX2-security.html):
> 
>  "The token timeout will be hard coded at 10 seconds for now. However, it may 
> be made configurable at some point if it seems to be a useful addition"
> 
> In case of lagged network cases (or bad network which required multiple 
> retries) 10 seconds is not enough.
> 
> Changes:
>  - Change name of MAX_CALLTOKEN_DELAY to lower case and remove const.
>  - Add general configuration variable `calltokenexpiration`
> 
> 
> Diffs
> -
> 
>   trunk/configs/samples/iax.conf.sample 432806 
>   trunk/channels/chan_iax2.c 432806 
> 
> Diff: https://reviewboard.asterisk.org/r/4588/diff/
> 
> 
> Testing
> ---
> 
> 
> Thanks,
> 
> Y Ateya
> 
>

-- 
_
-- Bandwidth and Colocation Provided by http://www.api-digital.com --

asterisk-dev mailing list
To UNSUBSCRIBE or update options visit:
   http://lists.digium.com/mailman/listinfo/asterisk-dev

Re: [asterisk-dev] [Code Review] 4499: Support in dialog OPTIONS

[Matt Jordan]

> On March 23, 2015, 3:01 p.m., Matt Jordan wrote:
> > Thanks for the patch! I've clicked the Ship It button, although the same 
> > statement about requiring tests for things going into Asterisk 13 that I 
> > made on the DTMF review applies here as well.
> > 
> > In this particular case, a test for this patch should be done using SIPp, 
> > as it is pretty easy to construct an inbound INVITE request and put an 
> > OPTION request in-dialog with that INVITE request.
> > 
> > Most of the tests in channels/pjsip use SIPp to drive the tests, and so 
> > there is a lot of material to base a test on. We also have sample SIPp 
> > scenarios to use as a template in the contrib/sipp folder.
> > 
> > If you have any questions about where to start with that, please don't 
> > hesitate to ask on the asterisk-dev mailing list/#asterisk-dev.
> 
> Joshua Colp wrote:
> A testsuite test has now been published for review at 
> https://gerrit.asterisk.org/#/c/37/

Since the test is up, I'm going to go ahead and commit this.

yaron: Thanks a lot for the patch!


- Matt


---
This is an automatically generated e-mail. To reply, visit:
https://reviewboard.asterisk.org/r/4499/#review14774
---


On March 18, 2015, 4:01 a.m., yaron nahum wrote:
> 
> ---
> This is an automatically generated e-mail. To reply, visit:
> https://reviewboard.asterisk.org/r/4499/
> ---
> 
> (Updated March 18, 2015, 4:01 a.m.)
> 
> 
> Review request for Asterisk Developers.
> 
> 
> Bugs: ASTERISK-24862
> https://issues.asterisk.org/jira/browse/ASTERISK-24862
> 
> 
> Repository: Asterisk
> 
> 
> Description
> ---
> 
> Respond to OPTIONS message sent on an existing dialog with 200OK. 
> This feature is vital in order to interoperate with some switches that send 
> OPTIONS message periodically per active call to make sure it is still alive. 
> Not responding would cause the switch to disconnect the call. 
> This functionality used to work on the old SIP channel, but was not 
> implemented on PJSIP.
> 
> 
> Diffs
> -
> 
>   /trunk/res/res_pjsip_dlg_options.c PRE-CREATION 
> 
> Diff: https://reviewboard.asterisk.org/r/4499/diff/
> 
> 
> Testing
> ---
> 
> 
> Thanks,
> 
> yaron nahum
> 
>

-- 
_
-- Bandwidth and Colocation Provided by http://www.api-digital.com --

asterisk-dev mailing list
To UNSUBSCRIBE or update options visit:
   http://lists.digium.com/mailman/listinfo/asterisk-dev

[asterisk-dev] Change in testsuite[master]: Testsuite: Caller & callee initiated local attended transfer...

[Matt Jordan (Code Review)]

Matt Jordan has posted comments on this change.

Change subject: Testsuite: Caller & callee initiated local attended transfers 
to application.
..


Patch Set 2: Code-Review+1

-- 
To view, visit https://gerrit.asterisk.org/34
To unsubscribe, visit https://gerrit.asterisk.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I61b70f83013b8d37de3fe1eea53c8dd2d026d2e0
Gerrit-PatchSet: 2
Gerrit-Project: testsuite
Gerrit-Branch: master
Gerrit-Owner: John Bigelow 
Gerrit-Reviewer: Matt Jordan 
Gerrit-HasComments: No

-- 
_
-- Bandwidth and Colocation Provided by http://www.api-digital.com --

asterisk-dev mailing list
To UNSUBSCRIBE or update options visit:
   http://lists.digium.com/mailman/listinfo/asterisk-dev

[asterisk-dev] Change in testsuite[master]: pjsip: Add test for OPTIONS requests received in-dialog.

[Matt Jordan (Code Review)]

Matt Jordan has posted comments on this change.

Change subject: pjsip: Add test for OPTIONS requests received in-dialog.
..


Patch Set 1: Code-Review+1

-- 
To view, visit https://gerrit.asterisk.org/37
To unsubscribe, visit https://gerrit.asterisk.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I137c66e4faad5212040f6aded6be2aac20fc473d
Gerrit-PatchSet: 1
Gerrit-Project: testsuite
Gerrit-Branch: master
Gerrit-Owner: Joshua Colp 
Gerrit-Reviewer: Matt Jordan 
Gerrit-HasComments: No

-- 
_
-- Bandwidth and Colocation Provided by http://www.api-digital.com --

asterisk-dev mailing list
To UNSUBSCRIBE or update options visit:
   http://lists.digium.com/mailman/listinfo/asterisk-dev